diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 18:32:56 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 18:32:56 +0300 |
commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
tree | 50774592eaba942cf378fca731d307f901b737b7 /arch/arm/mach-sa1100/jornada720.c | |
parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
download | linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.xz |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'arch/arm/mach-sa1100/jornada720.c')
-rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 89af0c831e8f..2f671cc3cb99 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -6,7 +6,7 @@ #include <linux/kernel.h> #include <linux/tty.h> #include <linux/delay.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/ioport.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> |