diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-20 11:39:26 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-20 11:39:26 +1100 |
| commit | b22da92f2cf52b3c51dd9a45abb658b1414b0784 (patch) | |
| tree | 7c602fb1b2d1de588fbfde6bb53662b3a1f8cb8a /arch/powerpc/platforms/40x/walnut.c | |
| parent | 52142e756e9bf6485d3d53596e8aff2e816a7253 (diff) | |
| parent | 3d1d662ef423adf6947a37e230f4d7e8ed7c9544 (diff) | |
| download | talos-op-linux-b22da92f2cf52b3c51dd9a45abb658b1414b0784.tar.gz talos-op-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/40x/walnut.c')
| -rw-r--r-- | arch/powerpc/platforms/40x/walnut.c | 3 |
1 files changed, 2 insertions, 1 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", }, |
