aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 10:32:56 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 10:32:56 -0500
commit4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch)
tree50774592eaba942cf378fca731d307f901b737b7 /arch/ppc/platforms
parenteb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff)
parent8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'arch/ppc/platforms')
-rw-r--r--arch/ppc/platforms/4xx/ibm440ep.c1
-rw-r--r--arch/ppc/platforms/4xx/ibmstb4.c1
-rw-r--r--arch/ppc/platforms/4xx/redwood5.c2
-rw-r--r--arch/ppc/platforms/4xx/redwood6.c2
-rw-r--r--arch/ppc/platforms/chrp_pegasos_eth.c2
-rw-r--r--arch/ppc/platforms/cpci690.c1
-rw-r--r--arch/ppc/platforms/ev64260.c1
-rw-r--r--arch/ppc/platforms/ev64360.c1
-rw-r--r--arch/ppc/platforms/hdpu.c1
-rw-r--r--arch/ppc/platforms/katana.c1
-rw-r--r--arch/ppc/platforms/radstone_ppc7d.c1
11 files changed, 11 insertions, 3 deletions
diff --git a/arch/ppc/platforms/4xx/ibm440ep.c b/arch/ppc/platforms/4xx/ibm440ep.c
index 4712de8ff80f..65ac0b9c2d05 100644
--- a/arch/ppc/platforms/4xx/ibm440ep.c
+++ b/arch/ppc/platforms/4xx/ibm440ep.c
@@ -14,6 +14,7 @@
14 */ 14 */
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/module.h> 16#include <linux/module.h>
17#include <linux/platform_device.h>
17#include <platforms/4xx/ibm440ep.h> 18#include <platforms/4xx/ibm440ep.h>
18#include <asm/ocp.h> 19#include <asm/ocp.h>
19#include <asm/ppc4xx_pic.h> 20#include <asm/ppc4xx_pic.h>
diff --git a/arch/ppc/platforms/4xx/ibmstb4.c b/arch/ppc/platforms/4xx/ibmstb4.c
index d90627b68faa..7e33bb635443 100644
--- a/arch/ppc/platforms/4xx/ibmstb4.c
+++ b/arch/ppc/platforms/4xx/ibmstb4.c
@@ -10,6 +10,7 @@
10 */ 10 */
11 11
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/platform_device.h>
13#include <asm/ocp.h> 14#include <asm/ocp.h>
14#include <asm/ppc4xx_pic.h> 15#include <asm/ppc4xx_pic.h>
15#include <platforms/4xx/ibmstb4.h> 16#include <platforms/4xx/ibmstb4.h>
diff --git a/arch/ppc/platforms/4xx/redwood5.c b/arch/ppc/platforms/4xx/redwood5.c
index bee8b4ac8afd..611ac861804d 100644
--- a/arch/ppc/platforms/4xx/redwood5.c
+++ b/arch/ppc/platforms/4xx/redwood5.c
@@ -14,7 +14,7 @@
14#include <linux/config.h> 14#include <linux/config.h>
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/pagemap.h> 16#include <linux/pagemap.h>
17#include <linux/device.h> 17#include <linux/platform_device.h>
18#include <linux/ioport.h> 18#include <linux/ioport.h>
19#include <asm/io.h> 19#include <asm/io.h>
20#include <asm/machdep.h> 20#include <asm/machdep.h>
diff --git a/arch/ppc/platforms/4xx/redwood6.c b/arch/ppc/platforms/4xx/redwood6.c
index 8b1012994dfc..b13116691289 100644
--- a/arch/ppc/platforms/4xx/redwood6.c
+++ b/arch/ppc/platforms/4xx/redwood6.c
@@ -12,7 +12,7 @@
12#include <linux/config.h> 12#include <linux/config.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/pagemap.h> 14#include <linux/pagemap.h>
15#include <linux/device.h> 15#include <linux/platform_device.h>
16#include <linux/ioport.h> 16#include <linux/ioport.h>
17#include <asm/io.h> 17#include <asm/io.h>
18#include <asm/ppc4xx_pic.h> 18#include <asm/ppc4xx_pic.h>
diff --git a/arch/ppc/platforms/chrp_pegasos_eth.c b/arch/ppc/platforms/chrp_pegasos_eth.c
index a9052305c35d..108a6e265185 100644
--- a/arch/ppc/platforms/chrp_pegasos_eth.c
+++ b/arch/ppc/platforms/chrp_pegasos_eth.c
@@ -13,7 +13,7 @@
13#include <linux/types.h> 13#include <linux/types.h>
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/ioport.h> 15#include <linux/ioport.h>
16#include <linux/device.h> 16#include <linux/platform_device.h>
17#include <linux/mv643xx.h> 17#include <linux/mv643xx.h>
18#include <linux/pci.h> 18#include <linux/pci.h>
19 19
diff --git a/arch/ppc/platforms/cpci690.c b/arch/ppc/platforms/cpci690.c
index f64ac2acb603..6ca7bcac9474 100644
--- a/arch/ppc/platforms/cpci690.c
+++ b/arch/ppc/platforms/cpci690.c
@@ -21,6 +21,7 @@
21#include <linux/initrd.h> 21#include <linux/initrd.h>
22#include <linux/root_dev.h> 22#include <linux/root_dev.h>
23#include <linux/mv643xx.h> 23#include <linux/mv643xx.h>
24#include <linux/platform_device.h>
24#include <asm/bootinfo.h> 25#include <asm/bootinfo.h>
25#include <asm/machdep.h> 26#include <asm/machdep.h>
26#include <asm/todc.h> 27#include <asm/todc.h>
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
index aa50637a5cfb..32358b3fb236 100644
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
@@ -33,6 +33,7 @@
33#include <linux/console.h> 33#include <linux/console.h>
34#include <linux/initrd.h> 34#include <linux/initrd.h>
35#include <linux/root_dev.h> 35#include <linux/root_dev.h>
36#include <linux/platform_device.h>
36#if !defined(CONFIG_SERIAL_MPSC_CONSOLE) 37#if !defined(CONFIG_SERIAL_MPSC_CONSOLE)
37#include <linux/serial.h> 38#include <linux/serial.h>
38#include <linux/tty.h> 39#include <linux/tty.h>
diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c
index 53388a1c334f..b1324564456e 100644
--- a/arch/ppc/platforms/ev64360.c
+++ b/arch/ppc/platforms/ev64360.c
@@ -25,6 +25,7 @@
25#include <linux/bootmem.h> 25#include <linux/bootmem.h>
26#include <linux/mtd/physmap.h> 26#include <linux/mtd/physmap.h>
27#include <linux/mv643xx.h> 27#include <linux/mv643xx.h>
28#include <linux/platform_device.h>
28#ifdef CONFIG_BOOTIMG 29#ifdef CONFIG_BOOTIMG
29#include <linux/bootimg.h> 30#include <linux/bootimg.h>
30#endif 31#endif
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c
index b6a66d5e9d83..50039a204c24 100644
--- a/arch/ppc/platforms/hdpu.c
+++ b/arch/ppc/platforms/hdpu.c
@@ -22,6 +22,7 @@
22#include <linux/irq.h> 22#include <linux/irq.h>
23#include <linux/ide.h> 23#include <linux/ide.h>
24#include <linux/seq_file.h> 24#include <linux/seq_file.h>
25#include <linux/platform_device.h>
25 26
26#include <linux/initrd.h> 27#include <linux/initrd.h>
27#include <linux/root_dev.h> 28#include <linux/root_dev.h>
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c
index a301c5ac58dd..6e58e30ceed1 100644
--- a/arch/ppc/platforms/katana.c
+++ b/arch/ppc/platforms/katana.c
@@ -29,6 +29,7 @@
29#include <linux/seq_file.h> 29#include <linux/seq_file.h>
30#include <linux/mtd/physmap.h> 30#include <linux/mtd/physmap.h>
31#include <linux/mv643xx.h> 31#include <linux/mv643xx.h>
32#include <linux/platform_device.h>
32#ifdef CONFIG_BOOTIMG 33#ifdef CONFIG_BOOTIMG
33#include <linux/bootimg.h> 34#include <linux/bootimg.h>
34#endif 35#endif
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 6f97911c330d..708b8739ecdd 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -40,6 +40,7 @@
40#include <linux/serial_core.h> 40#include <linux/serial_core.h>
41#include <linux/mv643xx.h> 41#include <linux/mv643xx.h>
42#include <linux/netdevice.h> 42#include <linux/netdevice.h>
43#include <linux/platform_device.h>
43 44
44#include <asm/system.h> 45#include <asm/system.h>
45#include <asm/pgtable.h> 46#include <asm/pgtable.h>