Ajout pour que B43 fonctionne correctement.

diff --git a/config/merlion/config-linux-3.6.1 b/config/merlion/config-linux-3.6.1
index 0bf7e92..7b790c7 100644 (file)
--- a/config/merlion/config-linux-3.6.1
+++ b/config/merlion/config-linux-3.6.1
@@ -1187,9 +1187,9 @@ CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
-# CONFIG_B43_PHY_N is not set
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
+CONFIG_B43_PHY_N=y
+# CONFIG_B43_PHY_LP is not set
+# CONFIG_B43_PHY_HT is not set
 # CONFIG_B43_DEBUG is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_BRCMFMAC is not set