diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:31:35 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:31:35 +0900 |
| commit | a639718b83867b3d4af3bf18c7e6a23d92b35f7a (patch) | |
| tree | 674067fd5c6ba24d049b9bc97279c085c090a3ae /arch/arm/mach-s5pv210/setup-sdhci.c | |
| parent | 0321c51f8f0ea8d0a7185a334356b2dca28a0846 (diff) | |
| parent | b42faa12f2a76f2a726d7e121aece285048f75f0 (diff) | |
Merge branch 'next-s5pv210' into for-next
Diffstat (limited to 'arch/arm/mach-s5pv210/setup-sdhci.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/setup-sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/setup-sdhci.c b/arch/arm/mach-s5pv210/setup-sdhci.c index 51815ec60c2..c32e202731c 100644 --- a/arch/arm/mach-s5pv210/setup-sdhci.c +++ b/arch/arm/mach-s5pv210/setup-sdhci.c @@ -26,9 +26,9 @@ char *s5pv210_hsmmc_clksrcs[4] = { [0] = "hsmmc", /* HCLK */ - [1] = "hsmmc", /* HCLK */ + /* [1] = "hsmmc", - duplicate HCLK entry */ [2] = "sclk_mmc", /* mmc_bus */ - /*[4] = reserved */ + /* [3] = NULL, - reserved */ }; void s5pv210_setup_sdhci_cfg_card(struct platform_device *dev, |