| commit | 5ff64611333fd282793ff8997e02138aa2f6aab9 | [log] [tgz] |
|---|---|---|
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Sun Apr 20 10:26:25 2008 +1000 |
| committer | Dave Airlie <airlied@linux.ie> | Sat Apr 26 17:48:17 2008 +1000 |
| tree | 2e12a44f3e55c28091dda4919d41a9d64078c077 | |
| 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>