diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-01-30 07:38:11 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-01-30 07:38:11 +0100 |
| commit | 48809a93083a5419cc3147950c3008ccdaf80860 (patch) | |
| tree | 1ea7c419bdee5f7a1740db71f9e75958b1867652 /arch | |
| parent | [POWERPC] Remove fastcall function attribute (diff) | |
| parent | [POWERPC] 83xx: Fix compiler warnings on 836x and 832x (diff) | |
| download | linux-48809a93083a5419cc3147950c3008ccdaf80860.tar.xz linux-48809a93083a5419cc3147950c3008ccdaf80860.zip | |
Merge branch '83xx' into for_paulus
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc8360e_pb.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index 36c75b003891..3ecb55f8a6e2 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -25,6 +25,7 @@ #include <linux/initrd.h> #include <asm/of_device.h> +#include <asm/of_platform.h> #include <asm/system.h> #include <asm/atomic.h> #include <asm/time.h> diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc8360e_pb.c index 832aec4a7443..ccce2f9f283d 100644 --- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c +++ b/arch/powerpc/platforms/83xx/mpc8360e_pb.c @@ -31,6 +31,7 @@ #include <linux/initrd.h> #include <asm/of_device.h> +#include <asm/of_platform.h> #include <asm/system.h> #include <asm/atomic.h> #include <asm/time.h> |