diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 20:10:12 (GMT) |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 20:10:12 (GMT) |
commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-s3c2412 | |
parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
download | linux-fsl-qoriq-af7a535688a758d15f06a98833e6a143b29af9de.tar.xz |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-s3c2412')
-rw-r--r-- | arch/arm/mach-s3c2412/clock.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/dma.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/gpio.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/irq.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-smdk2413.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-vstms.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/pm.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/s3c2412.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/sleep.S | 6 |
10 files changed, 47 insertions, 47 deletions
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index 1157b5a..af4b2ce 100644 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c @@ -34,12 +34,12 @@ #include <asm/mach/map.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/plat-s3c/regs-serial.h> -#include <asm/arch/regs-clock.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-clock.h> +#include <mach/regs-gpio.h> #include <asm/plat-s3c24xx/s3c2412.h> #include <asm/plat-s3c24xx/clock.h> diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index 1dd8649..22fc04a 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c @@ -18,18 +18,18 @@ #include <linux/serial_core.h> #include <asm/dma.h> -#include <asm/arch/dma.h> +#include <mach/dma.h> #include <asm/io.h> #include <asm/plat-s3c24xx/dma.h> #include <asm/plat-s3c24xx/cpu.h> #include <asm/plat-s3c/regs-serial.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> #include <asm/plat-s3c/regs-ac97.h> -#include <asm/arch/regs-mem.h> -#include <asm/arch/regs-lcd.h> -#include <asm/arch/regs-sdi.h> +#include <mach/regs-mem.h> +#include <mach/regs-lcd.h> +#include <mach/regs-sdi.h> #include <asm/plat-s3c24xx/regs-s3c2412-iis.h> #include <asm/plat-s3c24xx/regs-iis.h> #include <asm/plat-s3c24xx/regs-spi.h> diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c index 8e55c3a..f7afece 100644 --- a/arch/arm/mach-s3c2412/gpio.c +++ b/arch/arm/mach-s3c2412/gpio.c @@ -20,9 +20,9 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> -#include <asm/hardware.h> +#include <mach/hardware.h> int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) { diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c index cc1917b..ac62b79 100644 --- a/arch/arm/mach-s3c2412/irq.c +++ b/arch/arm/mach-s3c2412/irq.c @@ -25,15 +25,15 @@ #include <linux/ioport.h> #include <linux/sysdev.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/mach/irq.h> -#include <asm/arch/regs-irq.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-power.h> +#include <mach/regs-irq.h> +#include <mach/regs-gpio.h> +#include <mach/regs-power.h> #include <asm/plat-s3c24xx/cpu.h> #include <asm/plat-s3c24xx/irq.h> diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index 7f59247..30f613a 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c @@ -37,12 +37,12 @@ #include <asm/plat-s3c/nand.h> #include <asm/plat-s3c/iic.h> -#include <asm/arch/regs-power.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-mem.h> -#include <asm/arch/regs-lcd.h> -#include <asm/arch/spi-gpio.h> -#include <asm/arch/fb.h> +#include <mach/regs-power.h> +#include <mach/regs-gpio.h> +#include <mach/regs-mem.h> +#include <mach/regs-lcd.h> +#include <mach/spi-gpio.h> +#include <mach/fb.h> #include <asm/mach-types.h> diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index b126a53..80affb1 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c @@ -24,7 +24,7 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/hardware/iomd.h> #include <asm/setup.h> #include <asm/io.h> @@ -33,12 +33,12 @@ //#include <asm/debug-ll.h> #include <asm/plat-s3c/regs-serial.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-lcd.h> +#include <mach/regs-gpio.h> +#include <mach/regs-lcd.h> -#include <asm/arch/idle.h> +#include <mach/idle.h> #include <asm/plat-s3c24xx/udc.h> -#include <asm/arch/fb.h> +#include <mach/fb.h> #include <asm/plat-s3c24xx/s3c2410.h> #include <asm/plat-s3c24xx/s3c2412.h> diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c index 3298254..7a08b37 100644 --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c @@ -27,18 +27,18 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/setup.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/plat-s3c/regs-serial.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-lcd.h> +#include <mach/regs-gpio.h> +#include <mach/regs-lcd.h> -#include <asm/arch/idle.h> -#include <asm/arch/fb.h> +#include <mach/idle.h> +#include <mach/fb.h> #include <asm/plat-s3c/nand.h> diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index d4ffb2d..737523a 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c @@ -19,14 +19,14 @@ #include <linux/sysdev.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/arch/regs-power.h> -#include <asm/arch/regs-gpioj.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-dsc.h> +#include <mach/regs-power.h> +#include <mach/regs-gpioj.h> +#include <mach/regs-gpio.h> +#include <mach/regs-dsc.h> #include <asm/plat-s3c24xx/cpu.h> #include <asm/plat-s3c24xx/pm.h> diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index 98a0de9..d278010 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c @@ -25,22 +25,22 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/proc-fns.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/arch/reset.h> -#include <asm/arch/idle.h> +#include <mach/reset.h> +#include <mach/idle.h> -#include <asm/arch/regs-clock.h> +#include <mach/regs-clock.h> #include <asm/plat-s3c/regs-serial.h> -#include <asm/arch/regs-power.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-gpioj.h> -#include <asm/arch/regs-dsc.h> +#include <mach/regs-power.h> +#include <mach/regs-gpio.h> +#include <mach/regs-gpioj.h> +#include <mach/regs-dsc.h> #include <asm/plat-s3c24xx/regs-spi.h> -#include <asm/arch/regs-s3c2412.h> +#include <mach/regs-s3c2412.h> #include <asm/plat-s3c24xx/s3c2412.h> #include <asm/plat-s3c24xx/cpu.h> diff --git a/arch/arm/mach-s3c2412/sleep.S b/arch/arm/mach-s3c2412/sleep.S index db32cac..c82418e 100644 --- a/arch/arm/mach-s3c2412/sleep.S +++ b/arch/arm/mach-s3c2412/sleep.S @@ -22,10 +22,10 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <asm/hardware.h> -#include <asm/arch/map.h> +#include <mach/hardware.h> +#include <mach/map.h> -#include <asm/arch/regs-irq.h> +#include <mach/regs-irq.h> .text |