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/magician.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/magician.c')
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index c9d274f0048f..143f28adaf95 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
| @@ -26,18 +26,18 @@ | |||
| 26 | #include <linux/pda_power.h> | 26 | #include <linux/pda_power.h> |
| 27 | #include <linux/pwm_backlight.h> | 27 | #include <linux/pwm_backlight.h> |
| 28 | 28 | ||
| 29 | #include <asm/hardware.h> | 29 | #include <mach/hardware.h> |
| 30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
| 31 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
| 32 | #include <asm/arch/magician.h> | 32 | #include <mach/magician.h> |
| 33 | #include <asm/arch/mfp-pxa27x.h> | 33 | #include <mach/mfp-pxa27x.h> |
| 34 | #include <asm/arch/pxa-regs.h> | 34 | #include <mach/pxa-regs.h> |
| 35 | #include <asm/arch/pxa2xx-regs.h> | 35 | #include <mach/pxa2xx-regs.h> |
| 36 | #include <asm/arch/pxafb.h> | 36 | #include <mach/pxafb.h> |
| 37 | #include <asm/arch/i2c.h> | 37 | #include <mach/i2c.h> |
| 38 | #include <asm/arch/mmc.h> | 38 | #include <mach/mmc.h> |
| 39 | #include <asm/arch/irda.h> | 39 | #include <mach/irda.h> |
| 40 | #include <asm/arch/ohci.h> | 40 | #include <mach/ohci.h> |
| 41 | 41 | ||
| 42 | #include "devices.h" | 42 | #include "devices.h" |
| 43 | #include "generic.h" | 43 | #include "generic.h" |