git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
board-sx1-mmc.c
diff --git
a/arch/arm/mach-omap1/board-sx1-mmc.c
b/arch/arm/mach-omap1/board-sx1-mmc.c
index 5b33ae8141bc9844536a2edecbc5ab93b9c63c84..e8ddd86e3fda698f2227a86f78774f0603d89dd9 100644
(file)
--- a/
arch/arm/mach-omap1/board-sx1-mmc.c
+++ b/
arch/arm/mach-omap1/board-sx1-mmc.c
@@
-44,8
+44,7
@@
static struct omap_mmc_platform_data mmc1_data = {
.nr_slots = 1,
.slots[0] = {
.set_power = mmc_set_power,
- .ocr_mask = MMC_VDD_28_29 | MMC_VDD_30_31 |
- MMC_VDD_32_33 | MMC_VDD_33_34,
+ .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
.name = "mmcblk",
},
};