diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:39:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:39:56 -0700 |
| commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
| tree | 78f00fdeae26d018def75e7517aa50e56f4994df /arch/arm/mach-pxa | |
| parent | a2218cac0aacecbecebd3cabc43cc8a4a09cecbb (diff) | |
| parent | 217874feed0d3a6543a6b7127782f4a08bffd731 (diff) | |
| download | op-kernel-dev-1dd465cac8d3ba18a9840d032f6604147269c031.zip op-kernel-dev-1dd465cac8d3ba18a9840d032f6604147269c031.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/corgi_lcd.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/generic.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c index c5efcd0..c02ef7c 100644 --- a/arch/arm/mach-pxa/corgi_lcd.c +++ b/arch/arm/mach-pxa/corgi_lcd.c @@ -19,7 +19,6 @@ #include <linux/kernel.h> #include <linux/device.h> #include <linux/module.h> -#include <asm/mach-types.h> #include <asm/arch/akita.h> #include <asm/arch/corgi.h> #include <asm/arch/hardware.h> diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index a45aaa1..d0660a8 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -34,6 +34,7 @@ #include <asm/arch/udc.h> #include <asm/arch/pxafb.h> #include <asm/arch/mmc.h> +#include <asm/arch/i2c.h> #include "generic.h" |
