diff options
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/iic.h (renamed from include/asm-arm/plat-s3c/iic.h) | 0 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/regs-iic.h (renamed from include/asm-arm/plat-s3c/regs-iic.h) | 0 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 4 |
6 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 8db9c700e3c2..8da05f9e7bb4 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include <mach/regs-lcd.h> | 45 | #include <mach/regs-lcd.h> |
| 46 | 46 | ||
| 47 | #include <asm/plat-s3c/nand.h> | 47 | #include <asm/plat-s3c/nand.h> |
| 48 | #include <asm/plat-s3c/iic.h> | 48 | #include <plat/iic.h> |
| 49 | #include <mach/fb.h> | 49 | #include <mach/fb.h> |
| 50 | 50 | ||
| 51 | #include <linux/mtd/mtd.h> | 51 | #include <linux/mtd/mtd.h> |
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 82505517846c..836c9f639215 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <asm/mach/irq.h> | 40 | #include <asm/mach/irq.h> |
| 41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
| 42 | 42 | ||
| 43 | #include <asm/plat-s3c/iic.h> | 43 | #include <plat/iic.h> |
| 44 | #include <plat/regs-serial.h> | 44 | #include <plat/regs-serial.h> |
| 45 | 45 | ||
| 46 | #include <plat/clock.h> | 46 | #include <plat/clock.h> |
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index b08f18c8c47a..80208d37756d 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <plat/regs-serial.h> | 33 | #include <plat/regs-serial.h> |
| 34 | #include <asm/plat-s3c/nand.h> | 34 | #include <asm/plat-s3c/nand.h> |
| 35 | #include <asm/plat-s3c/iic.h> | 35 | #include <plat/iic.h> |
| 36 | 36 | ||
| 37 | #include <mach/regs-power.h> | 37 | #include <mach/regs-power.h> |
| 38 | #include <mach/regs-gpio.h> | 38 | #include <mach/regs-gpio.h> |
diff --git a/include/asm-arm/plat-s3c/iic.h b/arch/arm/plat-s3c/include/plat/iic.h index 5106acaa1d0e..5106acaa1d0e 100644 --- a/include/asm-arm/plat-s3c/iic.h +++ b/arch/arm/plat-s3c/include/plat/iic.h | |||
diff --git a/include/asm-arm/plat-s3c/regs-iic.h b/arch/arm/plat-s3c/include/plat/regs-iic.h index 2f7c17de8ac8..2f7c17de8ac8 100644 --- a/include/asm-arm/plat-s3c/regs-iic.h +++ b/arch/arm/plat-s3c/include/plat/regs-iic.h | |||
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index c772e02c2803..4ad9c47ee4fd 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -40,8 +40,8 @@ | |||
| 40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 41 | 41 | ||
| 42 | #include <mach/regs-gpio.h> | 42 | #include <mach/regs-gpio.h> |
| 43 | #include <asm/plat-s3c/regs-iic.h> | 43 | #include <plat/regs-iic.h> |
| 44 | #include <asm/plat-s3c/iic.h> | 44 | #include <plat/iic.h> |
| 45 | 45 | ||
| 46 | /* i2c controller state */ | 46 | /* i2c controller state */ |
| 47 | 47 | ||