diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 08:45:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 08:45:42 -0800 |
| commit | d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d (patch) | |
| tree | 092bf1f6cd50db2272d12ad6991ac3465f2d19ef /arch/arm/mach-pxa | |
| parent | fbf0e1348ec4023675123d432ce1fdfa1eef8e54 (diff) | |
| parent | 5470dc656820fb67c0a2e352f0aaa48b86c19026 (diff) | |
| download | linux-d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d.tar.bz2 | |
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 | 2 |
1 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 698eb06545c4..6dbcaf114ad7 100644 --- a/arch/arm/mach-pxa/corgi_lcd.c +++ b/arch/arm/mach-pxa/corgi_lcd.c @@ -22,7 +22,7 @@ #include <linux/string.h> #include <asm/arch/akita.h> #include <asm/arch/corgi.h> -#include <asm/arch/hardware.h> +#include <asm/hardware.h> #include <asm/arch/pxa-regs.h> #include <asm/arch/sharpsl.h> #include <asm/arch/spitz.h> |