diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /arch/ppc/platforms/cpci690.c | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'arch/ppc/platforms/cpci690.c')
| -rw-r--r-- | arch/ppc/platforms/cpci690.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/platforms/cpci690.c b/arch/ppc/platforms/cpci690.c index f64ac2acb603..6ca7bcac9474 100644 --- a/arch/ppc/platforms/cpci690.c +++ b/arch/ppc/platforms/cpci690.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/initrd.h> | 21 | #include <linux/initrd.h> |
| 22 | #include <linux/root_dev.h> | 22 | #include <linux/root_dev.h> |
| 23 | #include <linux/mv643xx.h> | 23 | #include <linux/mv643xx.h> |
| 24 | #include <linux/platform_device.h> | ||
| 24 | #include <asm/bootinfo.h> | 25 | #include <asm/bootinfo.h> |
| 25 | #include <asm/machdep.h> | 26 | #include <asm/machdep.h> |
| 26 | #include <asm/todc.h> | 27 | #include <asm/todc.h> |