diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-20 01:39:26 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-20 01:39:26 +0100 |
| commit | b22da92f2cf52b3c51dd9a45abb658b1414b0784 (patch) | |
| tree | 7c602fb1b2d1de588fbfde6bb53662b3a1f8cb8a /arch/powerpc/platforms | |
| parent | [POWERPC] Fix kmalloc alignment on non-coherent DMA platforms (diff) | |
| parent | [POWERPC] 4xx: Use virtual PVR value to init FPU on arch/ppc 440EP (diff) | |
| download | linux-b22da92f2cf52b3c51dd9a45abb658b1414b0784.tar.xz linux-b22da92f2cf52b3c51dd9a45abb658b1414b0784.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/40x/walnut.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/bamboo.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/ebony.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/sequoia.c | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/40x/walnut.c b/arch/powerpc/platforms/40x/walnut.c index eb0c136b1c44..ff6db2431798 100644 --- a/arch/powerpc/platforms/40x/walnut.c +++ b/arch/powerpc/platforms/40x/walnut.c @@ -17,12 +17,13 @@ */ #include <linux/init.h> +#include <linux/of_platform.h> + #include <asm/machdep.h> #include <asm/prom.h> #include <asm/udbg.h> #include <asm/time.h> #include <asm/uic.h> -#include <asm/of_platform.h> static struct of_device_id walnut_of_bus[] = { { .compatible = "ibm,plb3", }, diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c index 470e1a3fd755..be23f112184f 100644 --- a/arch/powerpc/platforms/44x/bamboo.c +++ b/arch/powerpc/platforms/44x/bamboo.c @@ -14,12 +14,13 @@ * option) any later version. */ #include <linux/init.h> +#include <linux/of_platform.h> + #include <asm/machdep.h> #include <asm/prom.h> #include <asm/udbg.h> #include <asm/time.h> #include <asm/uic.h> -#include <asm/of_platform.h> #include "44x.h" static struct of_device_id bamboo_of_bus[] = { diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c index 40e18fcb666c..6cd3476767cc 100644 --- a/arch/powerpc/platforms/44x/ebony.c +++ b/arch/powerpc/platforms/44x/ebony.c @@ -17,12 +17,13 @@ */ #include <linux/init.h> +#include <linux/of_platform.h> + #include <asm/machdep.h> #include <asm/prom.h> #include <asm/udbg.h> #include <asm/time.h> #include <asm/uic.h> -#include <asm/of_platform.h> #include "44x.h" diff --git a/arch/powerpc/platforms/44x/sequoia.c b/arch/powerpc/platforms/44x/sequoia.c index 30700b31d43b..21a9dd14f297 100644 --- a/arch/powerpc/platforms/44x/sequoia.c +++ b/arch/powerpc/platforms/44x/sequoia.c @@ -14,12 +14,13 @@ * option) any later version. */ #include <linux/init.h> +#include <linux/of_platform.h> + #include <asm/machdep.h> #include <asm/prom.h> #include <asm/udbg.h> #include <asm/time.h> #include <asm/uic.h> -#include <asm/of_platform.h> #include "44x.h" static struct of_device_id sequoia_of_bus[] = { |