diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /arch/arm/mach-s3c2443/clock.c | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
Diffstat (limited to 'arch/arm/mach-s3c2443/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 17f064fabdaf..6a8d7cced4a2 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
| @@ -34,10 +34,10 @@ | |||
| 34 | 34 | ||
| 35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
| 36 | 36 | ||
| 37 | #include <asm/hardware.h> | 37 | #include <mach/hardware.h> |
| 38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
| 39 | 39 | ||
| 40 | #include <asm/arch/regs-s3c2443-clock.h> | 40 | #include <mach/regs-s3c2443-clock.h> |
| 41 | 41 | ||
| 42 | #include <asm/plat-s3c24xx/s3c2443.h> | 42 | #include <asm/plat-s3c24xx/s3c2443.h> |
| 43 | #include <asm/plat-s3c24xx/clock.h> | 43 | #include <asm/plat-s3c24xx/clock.h> |