diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/cdrom/gdrom.c | 4 | ||||
-rw-r--r-- | drivers/input/keyboard/maple_keyb.c | 1 | ||||
-rw-r--r-- | drivers/video/pvr2fb.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 71ec426ecffc..1e0455bd6df9 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c | |||
@@ -39,8 +39,8 @@ | |||
39 | #include <asm/io.h> | 39 | #include <asm/io.h> |
40 | #include <asm/dma.h> | 40 | #include <asm/dma.h> |
41 | #include <asm/delay.h> | 41 | #include <asm/delay.h> |
42 | #include <asm/mach/dma.h> | 42 | #include <mach/dma.h> |
43 | #include <asm/mach/sysasic.h> | 43 | #include <mach/sysasic.h> |
44 | 44 | ||
45 | #define GDROM_DEV_NAME "gdrom" | 45 | #define GDROM_DEV_NAME "gdrom" |
46 | #define GD_SESSION_OFFSET 150 | 46 | #define GD_SESSION_OFFSET 150 |
diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c index 2b404284c28a..7797ef6e5e64 100644 --- a/drivers/input/keyboard/maple_keyb.c +++ b/drivers/input/keyboard/maple_keyb.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/timer.h> | 28 | #include <linux/timer.h> |
29 | #include <linux/maple.h> | 29 | #include <linux/maple.h> |
30 | #include <asm/mach/maple.h> | ||
31 | 30 | ||
32 | /* Very simple mutex to ensure proper cleanup */ | 31 | /* Very simple mutex to ensure proper cleanup */ |
33 | static DEFINE_MUTEX(maple_keyb_mutex); | 32 | static DEFINE_MUTEX(maple_keyb_mutex); |
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 |