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/plat-s3c24xx/common-smdk.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/plat-s3c24xx/common-smdk.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/common-smdk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index d528f460f6bc..3098736c65d9 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | 40 | ||
| 41 | #include <asm/plat-s3c/nand.h> | 41 | #include <asm/plat-s3c/nand.h> |
| 42 | 42 | ||
| 43 | #include <asm/plat-s3c24xx/common-smdk.h> | 43 | #include <plat/common-smdk.h> |
| 44 | #include <asm/plat-s3c24xx/devs.h> | 44 | #include <plat/devs.h> |
| 45 | #include <asm/plat-s3c24xx/pm.h> | 45 | #include <plat/pm.h> |
| 46 | 46 | ||
| 47 | /* LED devices */ | 47 | /* LED devices */ |
| 48 | 48 | ||