diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:30:12 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:30:12 -0500 |
| commit | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (patch) | |
| tree | b2a44e08e9e683078e9d20d6072a513798788314 /arch/arm/mach-omap2/board-omap4panda.c | |
| parent | 4931445b94f49672028b81ace9d4eee8ddf19ab2 (diff) | |
| parent | da1f026b532ce944d74461497dc6d8c16456466e (diff) | |
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index b82f2319a091..d4a9aa41e877 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
| @@ -142,6 +142,7 @@ static struct omap2_hsmmc_info mmc[] = { | |||
| 142 | .mmc = 1, | 142 | .mmc = 1, |
| 143 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, | 143 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, |
| 144 | .gpio_wp = -EINVAL, | 144 | .gpio_wp = -EINVAL, |
| 145 | .gpio_cd = -EINVAL, | ||
| 145 | }, | 146 | }, |
| 146 | {} /* Terminator */ | 147 | {} /* Terminator */ |
| 147 | }; | 148 | }; |