diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/mac/baboon.c | 1 | ||||
-rw-r--r-- | arch/m68k/mac/via.c | 1 | ||||
-rw-r--r-- | arch/mips/emma2rh/markeins/setup.c | 1 | ||||
-rw-r--r-- | arch/mips/jazz/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/ide.h | 1 | ||||
-rw-r--r-- | arch/sh/boards/mach-systemh/irq.c | 3 | ||||
-rw-r--r-- | arch/xtensa/kernel/xtensa_ksyms.c | 1 |
7 files changed, 1 insertions, 9 deletions
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c index dae9c982aa89..c7b25b0aacff 100644 --- a/arch/m68k/mac/baboon.c +++ b/arch/m68k/mac/baboon.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
12 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/ide.h> | ||
15 | 14 | ||
16 | #include <asm/traps.h> | 15 | #include <asm/traps.h> |
17 | #include <asm/bootinfo.h> | 16 | #include <asm/bootinfo.h> |
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index f3b27d04a31f..1bdb03c73c0f 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
30 | #include <linux/ide.h> | ||
31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
32 | 31 | ||
33 | #include <asm/bootinfo.h> | 32 | #include <asm/bootinfo.h> |
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c index a56c4b804b07..822a20e21fa4 100644 --- a/arch/mips/emma2rh/markeins/setup.c +++ b/arch/mips/emma2rh/markeins/setup.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | #include <linux/initrd.h> | 28 | #include <linux/initrd.h> |
29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
30 | #include <linux/ide.h> | ||
31 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
32 | #include <linux/param.h> /* for HZ */ | 31 | #include <linux/param.h> /* for HZ */ |
33 | #include <linux/root_dev.h> | 32 | #include <linux/root_dev.h> |
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index f60524e8bc44..b59ba6b93cdd 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * Copyright (C) 2007 by Thomas Bogendoerfer | 10 | * Copyright (C) 2007 by Thomas Bogendoerfer |
11 | */ | 11 | */ |
12 | #include <linux/eisa.h> | 12 | #include <linux/eisa.h> |
13 | #include <linux/hdreg.h> | ||
14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
15 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
16 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
@@ -18,7 +17,6 @@ | |||
18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
19 | #include <linux/console.h> | 18 | #include <linux/console.h> |
20 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
21 | #include <linux/ide.h> | ||
22 | #include <linux/pm.h> | 20 | #include <linux/pm.h> |
23 | #include <linux/screen_info.h> | 21 | #include <linux/screen_info.h> |
24 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
diff --git a/arch/powerpc/include/asm/ide.h b/arch/powerpc/include/asm/ide.h index 1aaf27be8741..048480e340f2 100644 --- a/arch/powerpc/include/asm/ide.h +++ b/arch/powerpc/include/asm/ide.h | |||
@@ -20,7 +20,6 @@ | |||
20 | #define __ide_mm_outsl(p, a, c) writesl((void __iomem *)(p), (a), (c)) | 20 | #define __ide_mm_outsl(p, a, c) writesl((void __iomem *)(p), (a), (c)) |
21 | 21 | ||
22 | #ifndef __powerpc64__ | 22 | #ifndef __powerpc64__ |
23 | #include <linux/hdreg.h> | ||
24 | #include <linux/ioport.h> | 23 | #include <linux/ioport.h> |
25 | 24 | ||
26 | /* FIXME: use ide_platform host driver */ | 25 | /* FIXME: use ide_platform host driver */ |
diff --git a/arch/sh/boards/mach-systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c index 0ba2fe674c47..601c9c8cdbec 100644 --- a/arch/sh/boards/mach-systemh/irq.c +++ b/arch/sh/boards/mach-systemh/irq.c | |||
@@ -11,9 +11,8 @@ | |||
11 | 11 | ||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/interrupt.h> | ||
14 | 15 | ||
15 | #include <linux/hdreg.h> | ||
16 | #include <linux/ide.h> | ||
17 | #include <asm/io.h> | 16 | #include <asm/io.h> |
18 | #include <asm/systemh7751.h> | 17 | #include <asm/systemh7751.h> |
19 | #include <asm/smc37c93x.h> | 18 | #include <asm/smc37c93x.h> |
diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c index 6e52cdd6166f..c9a7c5b74a0d 100644 --- a/arch/xtensa/kernel/xtensa_ksyms.c +++ b/arch/xtensa/kernel/xtensa_ksyms.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
20 | #include <linux/in6.h> | 20 | #include <linux/in6.h> |
21 | #include <linux/ide.h> | ||
22 | 21 | ||
23 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
24 | #include <asm/checksum.h> | 23 | #include <asm/checksum.h> |