From 6b48ac5c0200d48b36caa8626032341f92673598 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 21 May 2007 16:22:46 +0000 Subject: [PATCH] also enable CONFIG_WLAN_80211=y now ipw and friends should build again svn path=/dists/trunk/linux-2.6/; revision=8676 --- debian/arch/alpha/config | 1 + debian/arch/amd64/config | 1 + debian/arch/arm/config.iop32x | 5 +---- debian/arch/arm/config.ixp4xx | 5 +---- debian/arch/hppa/config | 1 + debian/arch/i386/config | 1 + debian/arch/ia64/config | 1 + debian/arch/mips/config.4kc-malta | 5 +---- debian/arch/mipsel/config.4kc-malta | 5 +---- debian/arch/mipsel/config.r5k-cobalt | 5 +---- debian/arch/powerpc/config | 1 + debian/changelog | 4 ++-- 12 files changed, 13 insertions(+), 22 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 2ffdf0b1b..c49ed774d 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -580,6 +580,7 @@ CONFIG_STRIP=m CONFIG_WAVELAN=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index f62bd1246..d4f807ffb 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -517,6 +517,7 @@ CONFIG_WLAN_PRE80211=y CONFIG_STRIP=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index f0178ce6e..df7bd89a3 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -863,11 +863,8 @@ CONFIG_BNX2=m # Wireless LAN (non-hamradio) # CONFIG_WLAN_PRE80211=y - -# -# Obsolete Wireless cards support (pre-802.11) -# CONFIG_STRIP=m +CONFIG_WLAN_80211=y # # Wireless 802.11b ISA/PCI cards support diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 3564b41fb..f60b63c64 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -846,11 +846,8 @@ CONFIG_IXP4XX_CRYPTO=m # Wireless LAN (non-hamradio) # CONFIG_WLAN_PRE80211=y - -# -# Obsolete Wireless cards support (pre-802.11) -# CONFIG_STRIP=m +CONFIG_WLAN_80211=y # # Wireless 802.11b ISA/PCI cards support diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index d83336e77..2780537a5 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -369,6 +369,7 @@ CONFIG_WLAN_PRE80211=y # CONFIG_WAVELAN is not set CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_HERMES=m # CONFIG_PLX_HERMES is not set diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 264043271..1bfeb5c1c 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -661,6 +661,7 @@ CONFIG_ARLAN=m CONFIG_WAVELAN=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 9e70f1ea3..e66d88b13 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -483,6 +483,7 @@ CONFIG_WLAN_PRE80211=y CONFIG_STRIP=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m diff --git a/debian/arch/mips/config.4kc-malta b/debian/arch/mips/config.4kc-malta index f7af37213..9e834d4fa 100644 --- a/debian/arch/mips/config.4kc-malta +++ b/debian/arch/mips/config.4kc-malta @@ -1425,11 +1425,8 @@ CONFIG_ABYSS=m # Wireless LAN (non-hamradio) # CONFIG_WLAN_PRE80211=y - -# -# Obsolete Wireless cards support (pre-802.11) -# CONFIG_STRIP=m +CONFIG_WLAN_80211=y # # Wireless 802.11b ISA/PCI cards support diff --git a/debian/arch/mipsel/config.4kc-malta b/debian/arch/mipsel/config.4kc-malta index b1c0dd7f5..8bb2e8d1f 100644 --- a/debian/arch/mipsel/config.4kc-malta +++ b/debian/arch/mipsel/config.4kc-malta @@ -1426,11 +1426,8 @@ CONFIG_ABYSS=m # Wireless LAN (non-hamradio) # CONFIG_WLAN_PRE80211=y - -# -# Obsolete Wireless cards support (pre-802.11) -# CONFIG_STRIP=m +CONFIG_WLAN_80211=y # # Wireless 802.11b ISA/PCI cards support diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index 757b3d53f..e053d5910 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -759,11 +759,8 @@ CONFIG_VIA_RHINE=m # Wireless LAN (non-hamradio) # CONFIG_WLAN_PRE80211=y - -# -# Obsolete Wireless cards support (pre-802.11) -# # CONFIG_STRIP is not set +CONFIG_WLAN_80211=y # # Wireless 802.11b ISA/PCI cards support diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 9e047853f..06127bd19 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -435,6 +435,7 @@ CONFIG_WLAN_PRE80211=y CONFIG_STRIP=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m CONFIG_HERMES=m CONFIG_APPLE_AIRPORT=m diff --git a/debian/changelog b/debian/changelog index 2eb59d861..f1c3efcb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,9 +11,9 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low DM_DELAY in topconfig. * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi. Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK. - * Enable WLAN_PRE80211 on all archs that had NET_RADIO enabled. + * Enable WLAN_PRE80211 and WLAN_80211 on all archs with NET_RADIO enabled. - -- maximilian attems Mon, 21 May 2007 18:17:55 +0200 + -- maximilian attems Mon, 21 May 2007 18:24:02 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low