diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:38:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:38:42 -0400 |
| commit | 49b75b87ce2dfbd99e59a50c3681b154d07e3a22 (patch) | |
| tree | f14e1da19a13d87a512f9043c2f37fd75dd122b3 /arch/arm/mach-pxa/littleton.c | |
| parent | f1c7f79b6ab4f7ada002a0fae47f462ede6b6857 (diff) | |
| parent | 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 (diff) | |
Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
[ARM] 5166/1: magician: add MAINTAINERS entry
[ARM] fix pnx4008 build errors
[ARM] Fix SMP booting with non-zero PHYS_OFFSET
[ARM] 5185/1: Fix spi num_chipselect for lubbock
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
[ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
[ARM] Eliminate useless includes of asm/mach-types.h
[ARM] Fix circular include dependency with IRQ headers
avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
avr32: Introduce arch/avr32/mach-*/include/mach
avr32: Move include/asm-avr32 to arch/avr32/include/asm
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
[ARM] pxa: introduce reset.h for reset specific header information
Diffstat (limited to 'arch/arm/mach-pxa/littleton.c')
| -rw-r--r-- | arch/arm/mach-pxa/littleton.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index dd759d03a9fd..58f3402a0375 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c | |||
| @@ -26,21 +26,21 @@ | |||
| 26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
| 27 | #include <asm/memory.h> | 27 | #include <asm/memory.h> |
| 28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 29 | #include <asm/hardware.h> | 29 | #include <mach/hardware.h> |
| 30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
| 31 | 31 | ||
| 32 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
| 33 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
| 34 | #include <asm/mach/irq.h> | 34 | #include <asm/mach/irq.h> |
| 35 | 35 | ||
| 36 | #include <asm/arch/pxa-regs.h> | 36 | #include <mach/pxa-regs.h> |
| 37 | #include <asm/arch/mfp-pxa300.h> | 37 | #include <mach/mfp-pxa300.h> |
| 38 | #include <asm/arch/gpio.h> | 38 | #include <mach/gpio.h> |
| 39 | #include <asm/arch/pxafb.h> | 39 | #include <mach/pxafb.h> |
| 40 | #include <asm/arch/ssp.h> | 40 | #include <mach/ssp.h> |
| 41 | #include <asm/arch/pxa27x_keypad.h> | 41 | #include <mach/pxa27x_keypad.h> |
| 42 | #include <asm/arch/pxa3xx_nand.h> | 42 | #include <mach/pxa3xx_nand.h> |
| 43 | #include <asm/arch/littleton.h> | 43 | #include <mach/littleton.h> |
| 44 | 44 | ||
| 45 | #include "generic.h" | 45 | #include "generic.h" |
| 46 | 46 | ||