diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/gpu/drm/via/via_dmablit.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/gpu/drm/via/via_dmablit.c')
| -rw-r--r-- | drivers/gpu/drm/via/via_dmablit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 327380888b4a..4c54f043068e 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include "via_dmablit.h" | 40 | #include "via_dmablit.h" |
| 41 | 41 | ||
| 42 | #include <linux/pagemap.h> | 42 | #include <linux/pagemap.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #define VIA_PGDN(x) (((unsigned long)(x)) & PAGE_MASK) | 45 | #define VIA_PGDN(x) (((unsigned long)(x)) & PAGE_MASK) |
| 45 | #define VIA_PGOFF(x) (((unsigned long)(x)) & ~PAGE_MASK) | 46 | #define VIA_PGOFF(x) (((unsigned long)(x)) & ~PAGE_MASK) |