diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-11 14:30:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-11 14:30:48 -0400 |
| commit | 2a9f0ba7a976bc2b1bcf9156c1e57ffbc8f8fb64 (patch) | |
| tree | df2d0a550c8bb0750b091c8a30d5d21cc684507c | |
| parent | 65ec1cd1e2c6228752d2f167b01e6d291014d249 (diff) | |
| parent | 603b6fd5b8d313a109d3739d8706ee51962ff402 (diff) | |
Merge branch 's3c-iis-header' into for-2.6.30
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/io.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/clock-dclk.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/io.h b/arch/arm/mach-s3c2410/include/mach/io.h index c477771c0924..9813dbf2ae4f 100644 --- a/arch/arm/mach-s3c2410/include/mach/io.h +++ b/arch/arm/mach-s3c2410/include/mach/io.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #ifndef __ASM_ARM_ARCH_IO_H | 9 | #ifndef __ASM_ARM_ARCH_IO_H |
| 10 | #define __ASM_ARM_ARCH_IO_H | 10 | #define __ASM_ARM_ARCH_IO_H |
| 11 | 11 | ||
| 12 | #include <mach/map.h> | 12 | #include <mach/hardware.h> |
| 13 | 13 | ||
| 14 | #define IO_SPACE_LIMIT 0xffffffff | 14 | #define IO_SPACE_LIMIT 0xffffffff |
| 15 | 15 | ||
diff --git a/arch/arm/plat-s3c24xx/clock-dclk.c b/arch/arm/plat-s3c24xx/clock-dclk.c index 35219dcf9f08..5b75a797b5ab 100644 --- a/arch/arm/plat-s3c24xx/clock-dclk.c +++ b/arch/arm/plat-s3c24xx/clock-dclk.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | #include <mach/regs-clock.h> | 19 | #include <mach/regs-clock.h> |
| 20 | #include <mach/regs-gpio.h> | 20 | #include <mach/regs-gpio.h> |
| 21 | #include <mach/hardware.h> | ||
| 22 | 21 | ||
| 23 | #include <plat/clock.h> | 22 | #include <plat/clock.h> |
| 24 | #include <plat/cpu.h> | 23 | #include <plat/cpu.h> |