diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:20:08 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:20:08 +0900 |
| commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
| tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/mach-s3c64xx/s3c6410.c | |
| parent | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (diff) | |
| parent | e90a0f3c460406d6a5a698016bc525c3e6968cb6 (diff) | |
| download | blackbird-op-linux-86f82da586098f16d92b5637808c323f5455e935.tar.gz blackbird-op-linux-86f82da586098f16d92b5637808c323f5455e935.zip | |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
Diffstat (limited to 'arch/arm/mach-s3c64xx/s3c6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/s3c6410.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c index 312aa6b115e8..4117003464ad 100644 --- a/arch/arm/mach-s3c64xx/s3c6410.c +++ b/arch/arm/mach-s3c64xx/s3c6410.c @@ -41,8 +41,8 @@ #include <plat/adc-core.h> #include <plat/iic-core.h> #include <plat/onenand-core.h> -#include <mach/s3c6400.h> -#include <mach/s3c6410.h> +#include <plat/s3c6400.h> +#include <plat/s3c6410.h> void __init s3c6410_map_io(void) { |
