git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos
/
mach-nuri.c
diff --git
a/arch/arm/mach-exynos/mach-nuri.c
b/arch/arm/mach-exynos/mach-nuri.c
index
c05d7aa
..
0b3f88e
100644
(file)
--- 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,
};