diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 18:44:09 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 18:44:09 +0900 |
| commit | 854bf596b3be4f4b41c5b3bd8039e4828ec1ace6 (patch) | |
| tree | 27b967178723f0230043dc0b0d1436d2eb81a29d /arch/arm/plat-s3c24xx | |
| parent | ab10f1dd914ad87e0370bd8b82f77dcd32b6d941 (diff) | |
| parent | 13d27f05d7b2c41d59c6e4bd6fc4ea10d3302ec3 (diff) | |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/s3c2443-clock.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index 2f91057a0c02..10ce6666687e 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c @@ -194,7 +194,6 @@ void __init s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *hard_s3c2410ts_ memcpy(&s3c2410ts_info, hard_s3c2410ts_info, sizeof(struct s3c2410_ts_mach_info)); s3c_device_ts.dev.platform_data = &s3c2410ts_info; } -EXPORT_SYMBOL(s3c24xx_ts_set_platdata); /* USB Device (Gadget)*/ diff --git a/arch/arm/plat-s3c24xx/s3c2443-clock.c b/arch/arm/plat-s3c24xx/s3c2443-clock.c index 461f070eb62d..82f2d4a39291 100644 --- a/arch/arm/plat-s3c24xx/s3c2443-clock.c +++ b/arch/arm/plat-s3c24xx/s3c2443-clock.c @@ -271,7 +271,7 @@ static struct clk init_clocks[] = { .ctrlbit = S3C2443_HCLKCON_DMA5, }, { .name = "hsmmc", - .id = 0, + .id = 1, .parent = &clk_h, .enable = s3c2443_clkcon_enable_h, .ctrlbit = S3C2443_HCLKCON_HSMMC, |