diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-01-07 13:07:15 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-16 22:58:57 -0500 |
| commit | 0173d422aa32fa1e5141f1759202b955215c1da2 (patch) | |
| tree | 74eb63d48a6096241391a366ec40a3ea6ca2ca96 | |
| parent | 0a4690cf751db6adb28b9275a6ecbaa6549a9ea8 (diff) | |
[POWERPC] Use <linux/of_{platform, device}.h> and not <asm/...> variants.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/of_device.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/rainier.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index 3388ad619996..5748ddb47d9f 100644 --- a/arch/powerpc/kernel/of_device.c +++ b/arch/powerpc/kernel/of_device.c | |||
| @@ -5,10 +5,10 @@ | |||
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | #include <linux/mod_devicetable.h> | 6 | #include <linux/mod_devicetable.h> |
| 7 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |
| 8 | #include <linux/of_device.h> | ||
| 8 | 9 | ||
| 9 | #include <asm/errno.h> | 10 | #include <asm/errno.h> |
| 10 | #include <asm/dcr.h> | 11 | #include <asm/dcr.h> |
| 11 | #include <asm/of_device.h> | ||
| 12 | 12 | ||
| 13 | static void of_device_make_bus_id(struct of_device *dev) | 13 | static void of_device_make_bus_id(struct of_device *dev) |
| 14 | { | 14 | { |
diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c index a4ce5ba8fe32..a7fae1cf69c1 100644 --- a/arch/powerpc/platforms/44x/rainier.c +++ b/arch/powerpc/platforms/44x/rainier.c | |||
| @@ -14,12 +14,13 @@ | |||
| 14 | * option) any later version. | 14 | * option) any later version. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/of_platform.h> | ||
| 18 | |||
| 17 | #include <asm/machdep.h> | 19 | #include <asm/machdep.h> |
| 18 | #include <asm/prom.h> | 20 | #include <asm/prom.h> |
| 19 | #include <asm/udbg.h> | 21 | #include <asm/udbg.h> |
| 20 | #include <asm/time.h> | 22 | #include <asm/time.h> |
| 21 | #include <asm/uic.h> | 23 | #include <asm/uic.h> |
| 22 | #include <asm/of_platform.h> | ||
| 23 | #include <asm/pci-bridge.h> | 24 | #include <asm/pci-bridge.h> |
| 24 | #include "44x.h" | 25 | #include "44x.h" |
| 25 | 26 | ||
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 144177d77cf1..3ce2d73b4177 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/serial.h> | 42 | #include <linux/serial.h> |
| 43 | #include <linux/smp.h> | 43 | #include <linux/smp.h> |
| 44 | #include <linux/bitops.h> | 44 | #include <linux/bitops.h> |
| 45 | #include <linux/of_device.h> | ||
| 45 | 46 | ||
| 46 | #include <asm/processor.h> | 47 | #include <asm/processor.h> |
| 47 | #include <asm/sections.h> | 48 | #include <asm/sections.h> |
| @@ -56,7 +57,6 @@ | |||
| 56 | #include <asm/dma.h> | 57 | #include <asm/dma.h> |
| 57 | #include <asm/cputable.h> | 58 | #include <asm/cputable.h> |
| 58 | #include <asm/time.h> | 59 | #include <asm/time.h> |
| 59 | #include <asm/of_device.h> | ||
| 60 | #include <asm/lmb.h> | 60 | #include <asm/lmb.h> |
| 61 | #include <asm/mpic.h> | 61 | #include <asm/mpic.h> |
| 62 | #include <asm/rtas.h> | 62 | #include <asm/rtas.h> |
