diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /arch/ppc/platforms/katana.c | |
| parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
| parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) | |
Merge Paulus' tree
Diffstat (limited to 'arch/ppc/platforms/katana.c')
| -rw-r--r-- | arch/ppc/platforms/katana.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c index a301c5ac58dd..6e58e30ceed1 100644 --- a/arch/ppc/platforms/katana.c +++ b/arch/ppc/platforms/katana.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
| 30 | #include <linux/mtd/physmap.h> | 30 | #include <linux/mtd/physmap.h> |
| 31 | #include <linux/mv643xx.h> | 31 | #include <linux/mv643xx.h> |
| 32 | #include <linux/platform_device.h> | ||
| 32 | #ifdef CONFIG_BOOTIMG | 33 | #ifdef CONFIG_BOOTIMG |
| 33 | #include <linux/bootimg.h> | 34 | #include <linux/bootimg.h> |
| 34 | #endif | 35 | #endif |