diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-07 00:11:21 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-07 00:11:21 +0100 |
| commit | 55b85967f4e988d43a11bf0e432f15892e615db0 (patch) | |
| tree | 101c2ddb5df41d0b813e3985a8be5c25facc45bf /arch/arm/mach-exynos/mach-nuri.c | |
| parent | Linux 3.7-rc4 (diff) | |
| parent | ARM: EXYNOS: Remove unused static uart resource information (diff) | |
| download | linux-55b85967f4e988d43a11bf0e432f15892e615db0.tar.xz linux-55b85967f4e988d43a11bf0e432f15892e615db0.zip | |
Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2
Diffstat (limited to 'arch/arm/mach-exynos/mach-nuri.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index c05d7aa84031..0b3f88e3ce64 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -113,7 +113,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = { .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED | MMC_CAP_ERASE), - .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE, .cd_type = S3C_SDHCI_CD_PERMANENT, }; |