diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /arch/ppc/platforms/ev64360.c | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/ppc/platforms/ev64360.c')
| -rw-r--r-- | arch/ppc/platforms/ev64360.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c index 53388a1c334f..b1324564456e 100644 --- a/arch/ppc/platforms/ev64360.c +++ b/arch/ppc/platforms/ev64360.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
| 26 | #include <linux/mtd/physmap.h> | 26 | #include <linux/mtd/physmap.h> |
| 27 | #include <linux/mv643xx.h> | 27 | #include <linux/mv643xx.h> |
| 28 | #include <linux/platform_device.h> | ||
| 28 | #ifdef CONFIG_BOOTIMG | 29 | #ifdef CONFIG_BOOTIMG |
| 29 | #include <linux/bootimg.h> | 30 | #include <linux/bootimg.h> |
| 30 | #endif | 31 | #endif |