drm: Fix mismerge of non-coherent DMA patch
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 20 Apr 2008 00:26:25 +0000 (10:26 +1000)
committerDave Airlie <airlied@linux.ie>
Sat, 26 Apr 2008 07:48:17 +0000 (17:48 +1000)
The patch for supporting non coherent PCI DMA in the DRM was mismerged
causing the page protection to be updated for the wrong type of
mapping.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

No differences found