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 git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom-peripherals.c
diff --git
a/arch/arm/mach-omap2/board-zoom-peripherals.c
b/arch/arm/mach-omap2/board-zoom-peripherals.c
index
6aa0728
..
189a6d1
100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/
arch/arm/mach-omap2/board-zoom-peripherals.c
@@
-213,7
+213,7
@@
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.name = "wl1271",
.mmc = 3,
{
.name = "wl1271",
.mmc = 3,
- .
wires = 4
,
+ .
caps = MMC_CAP_4_BIT_DATA
,
.gpio_wp = -EINVAL,
.gpio_cd = -EINVAL,
.nonremovable = true,
.gpio_wp = -EINVAL,
.gpio_cd = -EINVAL,
.nonremovable = true,