diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/video/pvr2fb.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/video/pvr2fb.c')
| -rw-r--r-- | drivers/video/pvr2fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c index 8c863a7f654b..0a0fd48a8566 100644 --- a/drivers/video/pvr2fb.c +++ b/drivers/video/pvr2fb.c | |||
| @@ -58,18 +58,18 @@ | |||
| 58 | 58 | ||
| 59 | #ifdef CONFIG_SH_DREAMCAST | 59 | #ifdef CONFIG_SH_DREAMCAST |
| 60 | #include <asm/machvec.h> | 60 | #include <asm/machvec.h> |
| 61 | #include <asm/mach/sysasic.h> | 61 | #include <mach-dreamcast/mach/sysasic.h> |
| 62 | #endif | 62 | #endif |
| 63 | 63 | ||
| 64 | #ifdef CONFIG_SH_DMA | 64 | #ifdef CONFIG_SH_DMA |
| 65 | #include <linux/pagemap.h> | 65 | #include <linux/pagemap.h> |
| 66 | #include <asm/mach/dma.h> | 66 | #include <mach/dma.h> |
| 67 | #include <asm/dma.h> | 67 | #include <asm/dma.h> |
| 68 | #endif | 68 | #endif |
| 69 | 69 | ||
| 70 | #ifdef CONFIG_SH_STORE_QUEUES | 70 | #ifdef CONFIG_SH_STORE_QUEUES |
| 71 | #include <linux/uaccess.h> | 71 | #include <linux/uaccess.h> |
| 72 | #include <asm/cpu/sq.h> | 72 | #include <cpu/sq.h> |
| 73 | #endif | 73 | #endif |
| 74 | 74 | ||
| 75 | #ifndef PCI_DEVICE_ID_NEC_NEON250 | 75 | #ifndef PCI_DEVICE_ID_NEC_NEON250 |