diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/mach-s3c2442 | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/mach-s3c2442')
| -rw-r--r-- | arch/arm/mach-s3c2442/clock.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/s3c2442.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2442/clock.c b/arch/arm/mach-s3c2442/clock.c index 18f2ce4d7b23..ea1aa1f5157a 100644 --- a/arch/arm/mach-s3c2442/clock.c +++ b/arch/arm/mach-s3c2442/clock.c | |||
| @@ -41,8 +41,8 @@ | |||
| 41 | 41 | ||
| 42 | #include <mach/regs-clock.h> | 42 | #include <mach/regs-clock.h> |
| 43 | 43 | ||
| 44 | #include <asm/plat-s3c24xx/clock.h> | 44 | #include <plat/clock.h> |
| 45 | #include <asm/plat-s3c24xx/cpu.h> | 45 | #include <plat/cpu.h> |
| 46 | 46 | ||
| 47 | /* S3C2442 extended clock support */ | 47 | /* S3C2442 extended clock support */ |
| 48 | 48 | ||
diff --git a/arch/arm/mach-s3c2442/s3c2442.c b/arch/arm/mach-s3c2442/s3c2442.c index fbf8264249da..4663bdc7fff6 100644 --- a/arch/arm/mach-s3c2442/s3c2442.c +++ b/arch/arm/mach-s3c2442/s3c2442.c | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | #include <linux/serial_core.h> | 19 | #include <linux/serial_core.h> |
| 20 | #include <linux/sysdev.h> | 20 | #include <linux/sysdev.h> |
| 21 | 21 | ||
| 22 | #include <asm/plat-s3c24xx/s3c2442.h> | 22 | #include <plat/s3c2442.h> |
| 23 | #include <asm/plat-s3c24xx/cpu.h> | 23 | #include <plat/cpu.h> |
| 24 | 24 | ||
| 25 | static struct sys_device s3c2442_sysdev = { | 25 | static struct sys_device s3c2442_sysdev = { |
| 26 | .cls = &s3c2442_sysclass, | 26 | .cls = &s3c2442_sysclass, |