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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-2430sdp.c
diff --git
a/arch/arm/mach-omap2/board-2430sdp.c
b/arch/arm/mach-omap2/board-2430sdp.c
index
b857ce4
..
b527f8d
100644
(file)
--- a/
arch/arm/mach-omap2/board-2430sdp.c
+++ b/
arch/arm/mach-omap2/board-2430sdp.c
@@
-19,6
+19,7
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
+#include <linux/mmc/host.h>
#include <linux/delay.h>
#include <linux/i2c/twl.h>
#include <linux/err.h>
#include <linux/delay.h>
#include <linux/i2c/twl.h>
#include <linux/err.h>
@@
-190,7
+191,7
@@
static int __init omap2430_i2c_init(void)
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.mmc = 1,
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.mmc = 1,
- .
wires = 4
,
+ .
caps = MMC_CAP_4_BIT_DATA
,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
.ext_clock = 1,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
.ext_clock = 1,