diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /arch/arm/mach-s3c2440 | |
| parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
| parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) | |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/dma.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-at2440evb.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index f33baad69d01..5b5ee0b8f4e0 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
| @@ -24,12 +24,12 @@ | |||
| 24 | 24 | ||
| 25 | #include <plat/regs-serial.h> | 25 | #include <plat/regs-serial.h> |
| 26 | #include <mach/regs-gpio.h> | 26 | #include <mach/regs-gpio.h> |
| 27 | #include <asm/plat-s3c/regs-ac97.h> | 27 | #include <plat/regs-ac97.h> |
| 28 | #include <mach/regs-mem.h> | 28 | #include <mach/regs-mem.h> |
| 29 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
| 30 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
| 31 | #include <asm/plat-s3c24xx/regs-iis.h> | 31 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 32 | #include <asm/plat-s3c24xx/regs-spi.h> | 32 | #include <plat/regs-spi.h> |
| 33 | 33 | ||
| 34 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { | 34 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { |
| 35 | [DMACH_XD0] = { | 35 | [DMACH_XD0] = { |
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index e2beca470484..334379bdfc6e 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <mach/regs-gpio.h> | 39 | #include <mach/regs-gpio.h> |
| 40 | #include <mach/regs-mem.h> | 40 | #include <mach/regs-mem.h> |
| 41 | #include <mach/regs-lcd.h> | 41 | #include <mach/regs-lcd.h> |
| 42 | #include <asm/plat-s3c/nand.h> | 42 | #include <plat/nand.h> |
| 43 | 43 | ||
| 44 | #include <linux/mtd/mtd.h> | 44 | #include <linux/mtd/mtd.h> |
| 45 | #include <linux/mtd/nand.h> | 45 | #include <linux/mtd/nand.h> |
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index 66876c6f2f1c..07b42a0207d1 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <mach/regs-gpio.h> | 35 | #include <mach/regs-gpio.h> |
| 36 | #include <mach/regs-mem.h> | 36 | #include <mach/regs-mem.h> |
| 37 | #include <mach/regs-lcd.h> | 37 | #include <mach/regs-lcd.h> |
| 38 | #include <asm/plat-s3c/nand.h> | 38 | #include <plat/nand.h> |
| 39 | 39 | ||
| 40 | #include <linux/mtd/mtd.h> | 40 | #include <linux/mtd/mtd.h> |
| 41 | #include <linux/mtd/nand.h> | 41 | #include <linux/mtd/nand.h> |
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 2361d606abc5..884a3c7ae75f 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <mach/regs-gpio.h> | 37 | #include <mach/regs-gpio.h> |
| 38 | #include <mach/regs-mem.h> | 38 | #include <mach/regs-mem.h> |
| 39 | #include <mach/regs-lcd.h> | 39 | #include <mach/regs-lcd.h> |
| 40 | #include <asm/plat-s3c/nand.h> | 40 | #include <plat/nand.h> |
| 41 | 41 | ||
| 42 | #include <linux/mtd/mtd.h> | 42 | #include <linux/mtd/mtd.h> |
| 43 | #include <linux/mtd/nand.h> | 43 | #include <linux/mtd/nand.h> |
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 4d14c7cff892..fbd081de592f 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #include <mach/regs-lcd.h> | 42 | #include <mach/regs-lcd.h> |
| 43 | 43 | ||
| 44 | #include <mach/h1940.h> | 44 | #include <mach/h1940.h> |
| 45 | #include <asm/plat-s3c/nand.h> | 45 | #include <plat/nand.h> |
| 46 | #include <mach/fb.h> | 46 | #include <mach/fb.h> |
| 47 | 47 | ||
| 48 | #include <plat/clock.h> | 48 | #include <plat/clock.h> |