diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 04:44:09 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 04:44:09 -0500 |
commit | 854bf596b3be4f4b41c5b3bd8039e4828ec1ace6 (patch) | |
tree | 27b967178723f0230043dc0b0d1436d2eb81a29d /arch/arm/mach-s3c2416/s3c2416.c | |
parent | ab10f1dd914ad87e0370bd8b82f77dcd32b6d941 (diff) | |
parent | 13d27f05d7b2c41d59c6e4bd6fc4ea10d3302ec3 (diff) |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/mach-s3c2416/s3c2416.c')
-rw-r--r-- | arch/arm/mach-s3c2416/s3c2416.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c index 63f39cdc0972..ba7fd8737434 100644 --- a/arch/arm/mach-s3c2416/s3c2416.c +++ b/arch/arm/mach-s3c2416/s3c2416.c | |||
@@ -53,6 +53,7 @@ | |||
53 | #include <plat/s3c2416.h> | 53 | #include <plat/s3c2416.h> |
54 | #include <plat/devs.h> | 54 | #include <plat/devs.h> |
55 | #include <plat/cpu.h> | 55 | #include <plat/cpu.h> |
56 | #include <plat/sdhci.h> | ||
56 | 57 | ||
57 | #include <plat/iic-core.h> | 58 | #include <plat/iic-core.h> |
58 | #include <plat/fb-core.h> | 59 | #include <plat/fb-core.h> |
@@ -115,6 +116,10 @@ void __init s3c2416_map_io(void) | |||
115 | s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_updown; | 116 | s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_updown; |
116 | s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_updown; | 117 | s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_updown; |
117 | 118 | ||
119 | /* initialize device information early */ | ||
120 | s3c2416_default_sdhci0(); | ||
121 | s3c2416_default_sdhci1(); | ||
122 | |||
118 | iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc)); | 123 | iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc)); |
119 | } | 124 | } |
120 | 125 | ||