diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-03 14:33:06 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-03 14:33:06 -0500 |
| commit | 8d883f0268b23fa3081cc4cdff45eb002d7e65b6 (patch) | |
| tree | 4ca2bccd2debbf081d61a5c2e9b7030f706dd4f1 | |
| parent | afae26be424341af502233fd990bfa60f55206bd (diff) | |
| parent | 81b91734e0e54096500d9765f46dfd85e36dcbb7 (diff) | |
Merge branch 'Wlan-next' of git://dev.omapzoom.org/pub/scm/pradeep/wlan-1283 into L24x8p3ti-2.6.34-omap4-L24.8-p3
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 215bb3fadabb..ca844276f64f 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -205,7 +205,7 @@ static struct omap_mmc_platform_data *hsmmc_data[OMAP44XX_NR_MMC] __initdata; #ifdef CONFIG_TIWLAN_SDIO static struct sdio_embedded_func wifi_func_array[] = { { - .f_class = SDIO_CLASS_BT_A, + .f_class = SDIO_CLASS_NONE, .f_maxblksize = 512, }, { |