Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

+2 -2

arch/arm/mach-s3c2410/dma.c

··· 24 24 25 25 #include <plat/regs-serial.h> 26 26 #include <mach/regs-gpio.h> 27 - #include <asm/plat-s3c/regs-ac97.h> 27 + #include <plat/regs-ac97.h> 28 28 #include <mach/regs-mem.h> 29 29 #include <mach/regs-lcd.h> 30 30 #include <mach/regs-sdi.h> 31 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 34 static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { 35 35 [DMACH_XD0] = {

+1 -1

arch/arm/mach-s3c2410/include/mach/system-reset.h

··· 13 13 #include <mach/hardware.h> 14 14 #include <linux/io.h> 15 15 16 - #include <asm/plat-s3c/regs-watchdog.h> 16 + #include <plat/regs-watchdog.h> 17 17 #include <mach/regs-clock.h> 18 18 19 19 #include <linux/clk.h>

+2 -2

arch/arm/mach-s3c2410/mach-bast.c

··· 44 44 #include <mach/regs-mem.h> 45 45 #include <mach/regs-lcd.h> 46 46 47 - #include <asm/plat-s3c/nand.h> 48 - #include <asm/plat-s3c/iic.h> 47 + #include <plat/nand.h> 48 + #include <plat/iic.h> 49 49 #include <mach/fb.h> 50 50 51 51 #include <linux/mtd/mtd.h>

+1 -1

arch/arm/mach-s3c2410/mach-h1940.c

··· 38 38 #include <mach/h1940.h> 39 39 #include <mach/h1940-latch.h> 40 40 #include <mach/fb.h> 41 - #include <asm/plat-s3c24xx/udc.h> 41 + #include <plat/udc.h> 42 42 43 43 #include <plat/clock.h> 44 44 #include <plat/devs.h>

+2 -2

arch/arm/mach-s3c2410/mach-n30.c

··· 40 40 #include <asm/mach/irq.h> 41 41 #include <asm/mach/map.h> 42 42 43 - #include <asm/plat-s3c/iic.h> 43 + #include <plat/iic.h> 44 44 #include <plat/regs-serial.h> 45 45 46 46 #include <plat/clock.h> 47 47 #include <plat/cpu.h> 48 48 #include <plat/devs.h> 49 49 #include <plat/s3c2410.h> 50 - #include <asm/plat-s3c24xx/udc.h> 50 + #include <plat/udc.h> 51 51 52 52 static struct map_desc n30_iodesc[] __initdata = { 53 53 /* nothing here yet */

+2 -2

arch/arm/mach-s3c2410/mach-qt2410.c

··· 50 50 #include <mach/leds-gpio.h> 51 51 #include <plat/regs-serial.h> 52 52 #include <mach/fb.h> 53 - #include <asm/plat-s3c/nand.h> 54 - #include <asm/plat-s3c24xx/udc.h> 53 + #include <plat/nand.h> 54 + #include <plat/udc.h> 55 55 #include <mach/spi.h> 56 56 #include <mach/spi-gpio.h> 57 57

+2 -2

arch/arm/mach-s3c2412/dma.c

··· 25 25 26 26 #include <plat/regs-serial.h> 27 27 #include <mach/regs-gpio.h> 28 - #include <asm/plat-s3c/regs-ac97.h> 28 + #include <plat/regs-ac97.h> 29 29 #include <mach/regs-mem.h> 30 30 #include <mach/regs-lcd.h> 31 31 #include <mach/regs-sdi.h> 32 32 #include <asm/plat-s3c24xx/regs-s3c2412-iis.h> 33 33 #include <asm/plat-s3c24xx/regs-iis.h> 34 - #include <asm/plat-s3c24xx/regs-spi.h> 34 + #include <plat/regs-spi.h> 35 35 36 36 #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } 37 37

+3 -3

arch/arm/mach-s3c2412/mach-jive.c

··· 31 31 #include <asm/mach/irq.h> 32 32 33 33 #include <plat/regs-serial.h> 34 - #include <asm/plat-s3c/nand.h> 35 - #include <asm/plat-s3c/iic.h> 34 + #include <plat/nand.h> 35 + #include <plat/iic.h> 36 36 37 37 #include <mach/regs-power.h> 38 38 #include <mach/regs-gpio.h> ··· 52 52 #include <plat/devs.h> 53 53 #include <plat/cpu.h> 54 54 #include <plat/pm.h> 55 - #include <asm/plat-s3c24xx/udc.h> 55 + #include <plat/udc.h> 56 56 57 57 static struct map_desc jive_iodesc[] __initdata = { 58 58 };

+1 -1

arch/arm/mach-s3c2412/mach-smdk2413.c

··· 37 37 #include <mach/regs-lcd.h> 38 38 39 39 #include <mach/idle.h> 40 - #include <asm/plat-s3c24xx/udc.h> 40 + #include <plat/udc.h> 41 41 #include <mach/fb.h> 42 42 43 43 #include <plat/s3c2410.h>

+1 -1

arch/arm/mach-s3c2412/mach-vstms.c

··· 39 39 #include <mach/idle.h> 40 40 #include <mach/fb.h> 41 41 42 - #include <asm/plat-s3c/nand.h> 42 + #include <plat/nand.h> 43 43 44 44 #include <plat/s3c2410.h> 45 45 #include <plat/s3c2412.h>

+1 -1

arch/arm/mach-s3c2412/s3c2412.c

··· 39 39 #include <mach/regs-gpio.h> 40 40 #include <mach/regs-gpioj.h> 41 41 #include <mach/regs-dsc.h> 42 - #include <asm/plat-s3c24xx/regs-spi.h> 42 + #include <plat/regs-spi.h> 43 43 #include <mach/regs-s3c2412.h> 44 44 45 45 #include <plat/s3c2412.h>

+2 -2

arch/arm/mach-s3c2440/dma.c

··· 24 24 25 25 #include <plat/regs-serial.h> 26 26 #include <mach/regs-gpio.h> 27 - #include <asm/plat-s3c/regs-ac97.h> 27 + #include <plat/regs-ac97.h> 28 28 #include <mach/regs-mem.h> 29 29 #include <mach/regs-lcd.h> 30 30 #include <mach/regs-sdi.h> 31 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 34 static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { 35 35 [DMACH_XD0] = {

+1 -1

arch/arm/mach-s3c2440/mach-anubis.c

··· 39 39 #include <mach/regs-gpio.h> 40 40 #include <mach/regs-mem.h> 41 41 #include <mach/regs-lcd.h> 42 - #include <asm/plat-s3c/nand.h> 42 + #include <plat/nand.h> 43 43 44 44 #include <linux/mtd/mtd.h> 45 45 #include <linux/mtd/nand.h>

+1 -1

arch/arm/mach-s3c2440/mach-at2440evb.c

··· 35 35 #include <mach/regs-gpio.h> 36 36 #include <mach/regs-mem.h> 37 37 #include <mach/regs-lcd.h> 38 - #include <asm/plat-s3c/nand.h> 38 + #include <plat/nand.h> 39 39 40 40 #include <linux/mtd/mtd.h> 41 41 #include <linux/mtd/nand.h>

+1 -1

arch/arm/mach-s3c2440/mach-osiris.c

··· 37 37 #include <mach/regs-gpio.h> 38 38 #include <mach/regs-mem.h> 39 39 #include <mach/regs-lcd.h> 40 - #include <asm/plat-s3c/nand.h> 40 + #include <plat/nand.h> 41 41 42 42 #include <linux/mtd/mtd.h> 43 43 #include <linux/mtd/nand.h>

+1 -1

arch/arm/mach-s3c2440/mach-rx3715.c

··· 42 42 #include <mach/regs-lcd.h> 43 43 44 44 #include <mach/h1940.h> 45 - #include <asm/plat-s3c/nand.h> 45 + #include <plat/nand.h> 46 46 #include <mach/fb.h> 47 47 48 48 #include <plat/clock.h>

+2 -2

arch/arm/mach-s3c2443/dma.c

··· 25 25 26 26 #include <plat/regs-serial.h> 27 27 #include <mach/regs-gpio.h> 28 - #include <asm/plat-s3c/regs-ac97.h> 28 + #include <plat/regs-ac97.h> 29 29 #include <mach/regs-mem.h> 30 30 #include <mach/regs-lcd.h> 31 31 #include <mach/regs-sdi.h> 32 32 #include <asm/plat-s3c24xx/regs-iis.h> 33 - #include <asm/plat-s3c24xx/regs-spi.h> 33 + #include <plat/regs-spi.h> 34 34 35 35 #define MAP(x) { \ 36 36 [0] = (x) | DMA_CH_VALID, \

+1 -1

arch/arm/plat-s3c/include/plat/uncompress.h

··· 28 28 /* defines for UART registers */ 29 29 30 30 #include <plat/regs-serial.h> 31 - #include <asm/plat-s3c/regs-watchdog.h> 31 + #include <plat/regs-watchdog.h> 32 32 33 33 /* working in physical space... */ 34 34 #undef S3C2410_WDOGREG

+1 -1

arch/arm/plat-s3c24xx/common-smdk.c

··· 38 38 #include <mach/regs-gpio.h> 39 39 #include <mach/leds-gpio.h> 40 40 41 - #include <asm/plat-s3c/nand.h> 41 + #include <plat/nand.h> 42 42 43 43 #include <plat/common-smdk.h> 44 44 #include <plat/devs.h>

+2 -2

arch/arm/plat-s3c24xx/devs.c

··· 29 29 #include <asm/irq.h> 30 30 31 31 #include <plat/regs-serial.h> 32 - #include <asm/plat-s3c24xx/udc.h> 32 + #include <plat/udc.h> 33 33 34 34 #include <plat/devs.h> 35 35 #include <plat/cpu.h> 36 - #include <asm/plat-s3c24xx/regs-spi.h> 36 + #include <plat/regs-spi.h> 37 37 38 38 /* Serial port registrations */ 39 39

+2 -2

drivers/i2c/busses/i2c-s3c2410.c

··· 40 40 #include <asm/io.h> 41 41 42 42 #include <mach/regs-gpio.h> 43 - #include <asm/plat-s3c/regs-iic.h> 44 - #include <asm/plat-s3c/iic.h> 43 + #include <plat/regs-iic.h> 44 + #include <plat/iic.h> 45 45 46 46 /* i2c controller state */ 47 47

+1 -1

drivers/mmc/host/s3cmci.c

··· 25 25 #include <mach/regs-sdi.h> 26 26 #include <mach/regs-gpio.h> 27 27 28 - #include <asm/plat-s3c24xx/mci.h> 28 + #include <plat/mci.h> 29 29 30 30 #include "s3cmci.h" 31 31

+2 -2

drivers/mtd/nand/s3c2410.c

··· 45 45 46 46 #include <asm/io.h> 47 47 48 - #include <asm/plat-s3c/regs-nand.h> 49 - #include <asm/plat-s3c/nand.h> 48 + #include <plat/regs-nand.h> 49 + #include <plat/nand.h> 50 50 51 51 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC 52 52 static int hardware_ecc = 1;

+1 -1

drivers/rtc/rtc-s3c.c

··· 26 26 #include <asm/uaccess.h> 27 27 #include <asm/io.h> 28 28 #include <asm/irq.h> 29 - #include <asm/plat-s3c/regs-rtc.h> 29 + #include <plat/regs-rtc.h> 30 30 31 31 /* I have yet to find an S3C implementation with more than one 32 32 * of these rtc blocks in */

+1 -1

drivers/spi/spi_s3c24xx.c

··· 28 28 #include <mach/hardware.h> 29 29 30 30 #include <mach/regs-gpio.h> 31 - #include <asm/plat-s3c24xx/regs-spi.h> 31 + #include <plat/regs-spi.h> 32 32 #include <mach/spi.h> 33 33 34 34 struct s3c24xx_spi {

+2 -2

drivers/usb/gadget/s3c2410_udc.c

··· 53 53 #include <mach/hardware.h> 54 54 #include <mach/regs-gpio.h> 55 55 56 - #include <asm/plat-s3c24xx/regs-udc.h> 57 - #include <asm/plat-s3c24xx/udc.h> 56 + #include <plat/regs-udc.h> 57 + #include <plat/udc.h> 58 58 59 59 60 60 #include "s3c2410_udc.h"

+1 -1

drivers/watchdog/s3c2410_wdt.c

··· 42 42 #undef S3C_VA_WATCHDOG 43 43 #define S3C_VA_WATCHDOG (0) 44 44 45 - #include <asm/plat-s3c/regs-watchdog.h> 45 + #include <plat/regs-watchdog.h> 46 46 47 47 #define PFX "s3c2410-wdt: " 48 48

include/asm-arm/plat-s3c/iic.h arch/arm/plat-s3c/include/plat/iic.h

include/asm-arm/plat-s3c/nand.h arch/arm/plat-s3c/include/plat/nand.h

include/asm-arm/plat-s3c/regs-ac97.h arch/arm/plat-s3c/include/plat/regs-ac97.h

include/asm-arm/plat-s3c/regs-iic.h arch/arm/plat-s3c/include/plat/regs-iic.h

include/asm-arm/plat-s3c/regs-nand.h arch/arm/plat-s3c/include/plat/regs-nand.h

include/asm-arm/plat-s3c/regs-rtc.h arch/arm/plat-s3c/include/plat/regs-rtc.h

include/asm-arm/plat-s3c/regs-watchdog.h arch/arm/plat-s3c/include/plat/regs-watchdog.h

include/asm-arm/plat-s3c24xx/mci.h arch/arm/plat-s3c24xx/include/plat/mci.h

include/asm-arm/plat-s3c24xx/regs-spi.h arch/arm/plat-s3c24xx/include/plat/regs-spi.h

include/asm-arm/plat-s3c24xx/regs-udc.h arch/arm/plat-s3c24xx/include/plat/regs-udc.h

include/asm-arm/plat-s3c24xx/udc.h arch/arm/plat-s3c24xx/include/plat/udc.h

+1 -1

sound/soc/s3c24xx/s3c2443-ac97.c

··· 28 28 #include <sound/soc.h> 29 29 30 30 #include <mach/hardware.h> 31 - #include <asm/plat-s3c/regs-ac97.h> 31 + #include <plat/regs-ac97.h> 32 32 #include <mach/regs-gpio.h> 33 33 #include <mach/regs-clock.h> 34 34 #include <mach/audio.h>