diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:07:19 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:07:19 -0400 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/mach-s5pv210/setup-sdhci.c | |
| parent | 500b9fc922cbec572f4fd1436533bfaed5011262 (diff) | |
| parent | a68fefe0d2f364ac3d8497ef37dcad713c261103 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
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 51815ec60c2a..c32e202731c1 100644 --- a/arch/arm/mach-s5pv210/setup-sdhci.c +++ b/arch/arm/mach-s5pv210/setup-sdhci.c | |||
| @@ -26,9 +26,9 @@ | |||
| 26 | 26 | ||
| 27 | char *s5pv210_hsmmc_clksrcs[4] = { | 27 | char *s5pv210_hsmmc_clksrcs[4] = { |
| 28 | [0] = "hsmmc", /* HCLK */ | 28 | [0] = "hsmmc", /* HCLK */ |
| 29 | [1] = "hsmmc", /* HCLK */ | 29 | /* [1] = "hsmmc", - duplicate HCLK entry */ |
| 30 | [2] = "sclk_mmc", /* mmc_bus */ | 30 | [2] = "sclk_mmc", /* mmc_bus */ |
| 31 | /*[4] = reserved */ | 31 | /* [3] = NULL, - reserved */ |
| 32 | }; | 32 | }; |
| 33 | 33 | ||
| 34 | void s5pv210_setup_sdhci_cfg_card(struct platform_device *dev, | 34 | void s5pv210_setup_sdhci_cfg_card(struct platform_device *dev, |