diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 13:20:08 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 13:20:08 +0200 |
| commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
| tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/mach-s3c64xx/mach-smdk6410.c | |
| parent | Merge branch 'next-samsung-devel' into next-samsung-devel-2 (diff) | |
| parent | ARM: SAMSUNG: Move S5P header files to plat-samsung (diff) | |
| download | linux-86f82da586098f16d92b5637808c323f5455e935.tar.xz 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/mach-smdk6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index d831c97833ba..a817d629c0e9 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -63,7 +63,7 @@ #include <plat/fb.h> #include <plat/gpio-cfg.h> -#include <mach/s3c6410.h> +#include <plat/s3c6410.h> #include <plat/clock.h> #include <plat/devs.h> #include <plat/cpu.h> |