diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 07:32:56 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 07:32:56 -0800 |
commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
tree | 50774592eaba942cf378fca731d307f901b737b7 /arch/ppc/platforms/hdpu.c | |
parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
download | op-kernel-dev-4fd5f8267dd37aaebadfabe71d9c808821eea05a.zip op-kernel-dev-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.gz |
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/hdpu.c')
-rw-r--r-- | arch/ppc/platforms/hdpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c index b6a66d5..50039a2 100644 --- a/arch/ppc/platforms/hdpu.c +++ b/arch/ppc/platforms/hdpu.c @@ -22,6 +22,7 @@ #include <linux/irq.h> #include <linux/ide.h> #include <linux/seq_file.h> +#include <linux/platform_device.h> #include <linux/initrd.h> #include <linux/root_dev.h> |