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/mach-s3c2443/clock.c | |
| parent | ab10f1dd914ad87e0370bd8b82f77dcd32b6d941 (diff) | |
| parent | 13d27f05d7b2c41d59c6e4bd6fc4ea10d3302ec3 (diff) | |
| download | talos-op-linux-854bf596b3be4f4b41c5b3bd8039e4828ec1ace6.tar.gz talos-op-linux-854bf596b3be4f4b41c5b3bd8039e4828ec1ace6.zip | |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/mach-s3c2443/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 0c3c0c884cd3..f4ec6d5715c8 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c @@ -196,7 +196,7 @@ static struct clksrc_clk clk_hsspi = { static struct clksrc_clk clk_hsmmc_div = { .clk = { .name = "hsmmc-div", - .id = -1, + .id = 1, .parent = &clk_esysclk.clk, }, .reg_div = { .reg = S3C2443_CLKDIV1, .size = 2, .shift = 6 }, @@ -231,7 +231,7 @@ static int s3c2443_enable_hsmmc(struct clk *clk, int enable) static struct clk clk_hsmmc = { .name = "hsmmc-if", - .id = -1, + .id = 1, .parent = &clk_hsmmc_div.clk, .enable = s3c2443_enable_hsmmc, .ops = &(struct clk_ops) { |
