diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 16:32:56 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 16:32:56 +0100 |
commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
tree | 50774592eaba942cf378fca731d307f901b737b7 /arch/arm/mach-pxa/poodle.c | |
parent | Input: adbhid - fix OOPS introduced by dynalloc conversion (diff) | |
parent | [DRIVER MODEL] Add missing driver_unregister to IMX serial driver (diff) | |
download | linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.xz linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.zip |
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-pxa/poodle.c')
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 6d413f6701a7..ad6a13f95a62 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c @@ -16,7 +16,7 @@ */ #include <linux/kernel.h> #include <linux/init.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/fb.h> #include <asm/hardware.h> |