diff --git a/[refs] b/[refs] index c23f9d6f5672..3c4e385876c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19b90c7c0fc0d9c9193d38fad180785aa6d7b7e3 +refs/heads/master: 12c67fca56ea7e5012a4e616d34ddecfbcd6c979 diff --git a/trunk/arch/arm/mach-s5pv210/setup-sdhci.c b/trunk/arch/arm/mach-s5pv210/setup-sdhci.c index 51815ec60c2a..c32e202731c1 100644 --- a/trunk/arch/arm/mach-s5pv210/setup-sdhci.c +++ b/trunk/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,