diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-02-08 14:07:02 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-02-08 14:07:02 +0100 |
commit | 46f000fb0e5fc2ee83efef934163ca3f56559ca2 (patch) | |
tree | 9ef8edc1418daa4ecb949f4565591cf75707e5eb /recipes-bsp | |
parent | 420df3be9eed030695d9c8ba905ab2edcb19174d (diff) | |
download | meta-ti-46f000fb0e5fc2ee83efef934163ca3f56559ca2.tar.gz |
linux-omap 2.6.37: sync with OE
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/linux/linux-omap/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-bsp/linux/linux-omap/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch b/recipes-bsp/linux/linux-omap/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch index 9b08d5f6..af12b2c9 100644 --- a/recipes-bsp/linux/linux-omap/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch +++ b/recipes-bsp/linux/linux-omap/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch | |||
@@ -87,7 +87,7 @@ index 64a181e..59b26da 100644 | |||
87 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | 87 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
88 | mmc[0].gpio_cd = gpio + 0; | 88 | mmc[0].gpio_cd = gpio + 0; |
89 | +#if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE) | 89 | +#if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE) |
90 | + if(!strcmp(expansionboard_name, "fixme-beagletoy")) { | 90 | + if(!strcmp(expansionboard_name, "bbtoys-wifi")) { |
91 | + omap2_hsmmc_init(mmcbbt); | 91 | + omap2_hsmmc_init(mmcbbt); |
92 | + /* link regulators to MMC adapters */ | 92 | + /* link regulators to MMC adapters */ |
93 | + beagle_vmmc1_supply.dev = mmcbbt[0].dev; | 93 | + beagle_vmmc1_supply.dev = mmcbbt[0].dev; |
@@ -112,7 +112,7 @@ index 64a181e..59b26da 100644 | |||
112 | gpio_export(162, 1); | 112 | gpio_export(162, 1); |
113 | } | 113 | } |
114 | 114 | ||
115 | + if(!strcmp(expansionboard_name, "fixme-beagletoy")) | 115 | + if(!strcmp(expansionboard_name, "bbtoys-wifi")) |
116 | + { | 116 | + { |
117 | + if (wl12xx_set_platform_data(&omap_beagle_wlan_data)) | 117 | + if (wl12xx_set_platform_data(&omap_beagle_wlan_data)) |
118 | + pr_err("error setting wl12xx data\n"); | 118 | + pr_err("error setting wl12xx data\n"); |