2009-03-17 21:00:44 +00:00
|
|
|
Index: compat-wireless-2009-03-13/config.mk
|
|
|
|
===================================================================
|
2009-03-17 22:46:51 +00:00
|
|
|
--- compat-wireless-2009-03-13.orig/config.mk 2009-03-17 23:34:31.000000000 +0100
|
|
|
|
+++ compat-wireless-2009-03-13/config.mk 2009-03-17 23:40:08.000000000 +0100
|
2009-02-26 18:03:20 +00:00
|
|
|
@@ -91,10 +91,10 @@ CONFIG_MAC80211_MESH=y
|
2008-11-29 15:48:42 +00:00
|
|
|
CONFIG_CFG80211=m
|
2009-01-22 14:52:27 +00:00
|
|
|
# CONFIG_CFG80211_REG_DEBUG is not set
|
|
|
|
|
2008-11-29 15:48:42 +00:00
|
|
|
-CONFIG_LIB80211=m
|
|
|
|
-CONFIG_LIB80211_CRYPT_WEP=m
|
|
|
|
-CONFIG_LIB80211_CRYPT_CCMP=m
|
|
|
|
-CONFIG_LIB80211_CRYPT_TKIP=m
|
2009-01-22 14:52:27 +00:00
|
|
|
+# CONFIG_LIB80211=m
|
|
|
|
+# CONFIG_LIB80211_CRYPT_WEP=m
|
|
|
|
+# CONFIG_LIB80211_CRYPT_CCMP=m
|
|
|
|
+# CONFIG_LIB80211_CRYPT_TKIP=m
|
2008-11-29 15:48:42 +00:00
|
|
|
|
|
|
|
CONFIG_NL80211=y
|
2009-01-22 14:52:27 +00:00
|
|
|
|
2009-03-17 21:00:44 +00:00
|
|
|
@@ -129,18 +129,18 @@ CONFIG_IWL3945_LEDS=y
|
|
|
|
|
|
|
|
|
2009-01-22 14:52:27 +00:00
|
|
|
CONFIG_B43=m
|
2009-03-17 21:00:44 +00:00
|
|
|
-CONFIG_B43_PCI_AUTOSELECT=y
|
|
|
|
-CONFIG_B43_PCICORE_AUTOSELECT=y
|
2009-01-22 14:52:27 +00:00
|
|
|
-CONFIG_B43_PCMCIA=y
|
2009-03-17 21:00:44 +00:00
|
|
|
-CONFIG_B43_PIO=y
|
2008-11-29 15:48:42 +00:00
|
|
|
-CONFIG_B43_LEDS=y
|
2009-03-17 21:00:44 +00:00
|
|
|
+# CONFIG_B43_PCI_AUTOSELECT=y
|
|
|
|
+# CONFIG_B43_PCICORE_AUTOSELECT=y
|
|
|
|
+# CONFIG_B43_PCMCIA=y
|
|
|
|
+# CONFIG_B43_PIO=y
|
2009-01-22 14:52:27 +00:00
|
|
|
+# CONFIG_B43_LEDS=y
|
|
|
|
# CONFIG_B43_RFKILL=y
|
2008-11-29 15:48:42 +00:00
|
|
|
# CONFIG_B43_DEBUG is not set
|
|
|
|
|
|
|
|
CONFIG_B43LEGACY=m
|
2009-01-22 14:52:27 +00:00
|
|
|
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
|
|
|
|
CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
|
|
|
|
-CONFIG_B43LEGACY_LEDS=y
|
|
|
|
+# CONFIG_B43LEGACY_LEDS=y
|
|
|
|
# CONFIG_B43LEGACY_RFKILL=y
|
|
|
|
# CONFIG_B43LEGACY_DEBUG=y
|
|
|
|
CONFIG_B43LEGACY_DMA=y
|
2009-02-26 18:03:20 +00:00
|
|
|
@@ -150,17 +150,17 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
2009-01-22 14:52:27 +00:00
|
|
|
# CONFIG_B43LEGACY_PIO_MODE is not set
|
2008-10-10 01:45:35 +00:00
|
|
|
|
|
|
|
# The Intel ipws
|
2008-11-29 15:48:42 +00:00
|
|
|
-CONFIG_LIBIPW=m
|
2009-01-22 14:52:27 +00:00
|
|
|
+# CONFIG_LIBIPW=m
|
|
|
|
# CONFIG_LIBIPW_DEBUG is not set
|
|
|
|
|
2008-10-10 01:45:35 +00:00
|
|
|
-CONFIG_IPW2100=m
|
|
|
|
-CONFIG_IPW2100_MONITOR=y
|
2009-01-22 14:52:27 +00:00
|
|
|
+# CONFIG_IPW2100=m
|
|
|
|
+# CONFIG_IPW2100_MONITOR=y
|
|
|
|
# CONFIG_IPW2100_DEBUG is not set
|
2008-10-10 01:45:35 +00:00
|
|
|
-CONFIG_IPW2200=m
|
|
|
|
-CONFIG_IPW2200_MONITOR=y
|
|
|
|
-CONFIG_IPW2200_RADIOTAP=y
|
|
|
|
-CONFIG_IPW2200_PROMISCUOUS=y
|
2009-01-22 14:52:27 +00:00
|
|
|
-CONFIG_IPW2200_QOS=y
|
|
|
|
+# CONFIG_IPW2200=m
|
|
|
|
+# CONFIG_IPW2200_MONITOR=y
|
|
|
|
+# CONFIG_IPW2200_RADIOTAP=y
|
|
|
|
+# CONFIG_IPW2200_PROMISCUOUS=y
|
|
|
|
+# CONFIG_IPW2200_QOS=y
|
|
|
|
# CONFIG_IPW2200_DEBUG is not set
|
2008-10-10 01:45:35 +00:00
|
|
|
# The above enables use a second interface prefixed 'rtap'.
|
|
|
|
# Example usage:
|
2009-03-17 22:46:51 +00:00
|
|
|
@@ -176,13 +176,13 @@ CONFIG_IPW2200_QOS=y
|
|
|
|
# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
|
|
|
|
|
|
|
|
CONFIG_SSB_BLOCKIO=y
|
|
|
|
-CONFIG_SSB_PCIHOST_POSSIBLE=y
|
|
|
|
-CONFIG_SSB_PCIHOST=y
|
|
|
|
+# CONFIG_SSB_PCIHOST_POSSIBLE=y
|
|
|
|
+# CONFIG_SSB_PCIHOST=y
|
|
|
|
CONFIG_SSB_B43_PCI_BRIDGE=y
|
|
|
|
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
|
|
|
|
-CONFIG_SSB_PCMCIAHOST=y
|
|
|
|
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
|
|
|
-CONFIG_SSB_DRIVER_PCICORE=y
|
|
|
|
+# CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
|
|
|
|
+# CONFIG_SSB_PCMCIAHOST=y
|
|
|
|
+# CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
|
|
|
+# CONFIG_SSB_DRIVER_PCICORE=y
|
|
|
|
|
|
|
|
CONFIG_P54_PCI=m
|
|
|
|
|
|
|
|
@@ -277,21 +277,21 @@ CONFIG_P54_COMMON=m
|
|
|
|
# Sonics Silicon Backplane
|
|
|
|
CONFIG_SSB_POSSIBLE=y
|
|
|
|
CONFIG_SSB=m
|
|
|
|
-CONFIG_SSB_SPROM=y
|
|
|
|
+# CONFIG_SSB_SPROM=y
|
|
|
|
# CONFIG_SSB_DEBUG is not set
|
|
|
|
|
2008-10-10 01:45:35 +00:00
|
|
|
ifneq ($(CONFIG_USB),)
|
2008-11-29 15:48:42 +00:00
|
|
|
ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
|
|
|
|
CONFIG_LIBERTAS_USB=m
|
2008-10-10 01:45:35 +00:00
|
|
|
-NEED_LIBERTAS=y
|
|
|
|
+#NEED_LIBERTAS=y
|
2008-11-29 15:48:42 +00:00
|
|
|
endif
|
2008-10-10 01:45:35 +00:00
|
|
|
endif
|
|
|
|
ifneq ($(CONFIG_PCMCIA),)
|
|
|
|
CONFIG_LIBERTAS_CS=m
|
2008-11-29 15:48:42 +00:00
|
|
|
-NEED_LIBERTAS=y
|
|
|
|
+#NEED_LIBERTAS=y
|
|
|
|
endif
|
|
|
|
ifeq ($(NEED_LIBERTAS),y)
|
|
|
|
-CONFIG_LIBERTAS=m
|
|
|
|
+#CONFIG_LIBERTAS=m
|
|
|
|
# Libertas uses the old stack but not fully, it will soon
|
|
|
|
# be cleaned.
|
|
|
|
endif
|