apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next-s3c24xx' into for-next

Browse Source
This commit is contained in:
Kukjin Kim
2011-01-06 18:44:09 +09:00
parent ab10f1dd91 13d27f05d7
commit 854bf596b3
21 changed files with 261 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/plat-s3c24xx/devs.c
-1
View File
@@ -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)*/
arch/arm/plat-s3c24xx/s3c2443-clock.c
+1 -1
View File
@@ -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,