diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-01-30 01:38:11 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-01-30 01:38:11 -0500 |
| commit | 48809a93083a5419cc3147950c3008ccdaf80860 (patch) | |
| tree | 1ea7c419bdee5f7a1740db71f9e75958b1867652 | |
| parent | 8943212c97cc56d4dcc853a097740e327fe8a6fe (diff) | |
| parent | 3b6eb6af5f20471a8cb1b8a3d090401e9a8a2bb8 (diff) | |
Merge branch '83xx' into for_paulus
| -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 @@ | |||
| 25 | #include <linux/initrd.h> | 25 | #include <linux/initrd.h> |
| 26 | 26 | ||
| 27 | #include <asm/of_device.h> | 27 | #include <asm/of_device.h> |
| 28 | #include <asm/of_platform.h> | ||
| 28 | #include <asm/system.h> | 29 | #include <asm/system.h> |
| 29 | #include <asm/atomic.h> | 30 | #include <asm/atomic.h> |
| 30 | #include <asm/time.h> | 31 | #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 @@ | |||
| 31 | #include <linux/initrd.h> | 31 | #include <linux/initrd.h> |
| 32 | 32 | ||
| 33 | #include <asm/of_device.h> | 33 | #include <asm/of_device.h> |
| 34 | #include <asm/of_platform.h> | ||
| 34 | #include <asm/system.h> | 35 | #include <asm/system.h> |
| 35 | #include <asm/atomic.h> | 36 | #include <asm/atomic.h> |
| 36 | #include <asm/time.h> | 37 | #include <asm/time.h> |