diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
| commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
| tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/arm/mach-s3c64xx/mach-mini6410.c | |
| parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
| parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
| download | linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz | |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-mini6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-mini6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index fb8969aa412e..1bc85c359498 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c @@ -32,8 +32,8 @@ #include <mach/regs-gpio.h> #include <mach/regs-modem.h> #include <mach/regs-srom.h> -#include <mach/s3c6410.h> +#include <plat/s3c6410.h> #include <plat/adc.h> #include <plat/cpu.h> #include <plat/devs.h> |