diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-04-20 10:26:25 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-04-26 17:48:17 +1000 |
commit | 5ff64611333fd282793ff8997e02138aa2f6aab9 (patch) | |
tree | 2e12a44f3e55c28091dda4919d41a9d64078c077 /drivers/Makefile | |
parent | b1721d0da266b4af8cb4419473b4ca36206ab200 (diff) |
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/Makefile')
0 files changed, 0 insertions, 0 deletions