summaryrefslogtreecommitdiff
path: root/drivers/char/drm/ati_pcigart.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-04-20 04:26:25 +0400
committerDave Airlie <airlied@linux.ie>2008-04-26 11:48:17 +0400
commit5ff64611333fd282793ff8997e02138aa2f6aab9 (patch)
tree2e12a44f3e55c28091dda4919d41a9d64078c077 /drivers/char/drm/ati_pcigart.c
parentb1721d0da266b4af8cb4419473b4ca36206ab200 (diff)
downloadlinux-5ff64611333fd282793ff8997e02138aa2f6aab9.tar.xz
drm: Fix mismerge of non-coherent DMA patch
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>
Diffstat (limited to 'drivers/char/drm/ati_pcigart.c')
0 files changed, 0 insertions, 0 deletions