Disable with_backports (pending removal)

Disable a number of drivers for ancient wireless LAN cards
Disable iwm3200-related drivers (hardware never released)
Disable "thin firmware" version of libertas driver (libertas_tf)

2 files changed, 19 insertions, 35 deletions

diff --git a/config-generic b/config-generic
index 4bbf1c66f..105726e35 100644
--- a/config-generic
+++ b/config-generic
@@ -69,9 +69,7 @@ CONFIG_SLUB=y
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_ATMEL_PWM is not set
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-CONFIG_IWMC3200TOP_DEBUGFS=y
+# CONFIG_IWMC3200TOP is not set
 
 #
 # Loadable module support
@@ -1435,9 +1433,9 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_IWMC3200_SDIO=y
+# CONFIG_WIMAX_IWMC3200_SDIO is not set
 
-CONFIG_ADM8211=m
+# CONFIG_ADM8211 is not set
 CONFIG_ATH_COMMON=m
 CONFIG_ATH5K=m
 CONFIG_ATH5K_DEBUG=y
@@ -1457,9 +1455,9 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_HWRNG is not set
 CONFIG_AT76C50X_USB=m
-CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
-CONFIG_ATMEL=m
+# CONFIG_AIRO is not set
+# CONFIG_AIRO_CS is not set
+# CONFIG_ATMEL is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
@@ -1482,20 +1480,8 @@ CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCMDBG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-# CONFIG_HERMES_PRISM is not set
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_ORINOCO_USB=m
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_CS=m
+# CONFIG_HERMES is not set
+# CONFIG_HOSTAP is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1506,9 +1492,7 @@ CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_DEBUG=y
@@ -1521,20 +1505,15 @@ CONFIG_IWLEGACY_DEBUGFS=y
 # CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
 CONFIG_IWL4965=y
 CONFIG_IWL3945=m
+# CONFIG_IWM is not set
 # CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-# CONFIG_IWM_TRACING is not set
 CONFIG_MAC80211_HWSIM=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
-CONFIG_PCI_ATMEL=m
 CONFIG_MWL8K=m
 # CONFIG_PRISM54 is not set
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
+# CONFIG_PCMCIA_WL3501 is not set
 CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
@@ -1554,8 +1533,7 @@ CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT73USB=m
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
-CONFIG_TMD_HERMES=m
-CONFIG_USB_ZD1201=m
+# CONFIG_USB_ZD1201 is not set
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_NET_SMSC75XX=m
diff --git a/kernel.spec b/kernel.spec
index 1f801f019..38dd36aac 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -218,7 +218,7 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to disable with_backports.)
 #
-# % define with_backports 0
+%define with_backports 0
 #######################################################################
 
 %define make_target bzImage
@@ -2376,6 +2376,12 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Feb 29 2012 John W. Linville <linville@redhat.com>
+- Disable with_backports (pending removal)
+- Disable a number of drivers for ancient wireless LAN cards
+- Disable iwm3200-related drivers (hardware never released)
+- Disable "thin firmware" version of libertas driver (libertas_tf)
+
 * Tue Feb 28 2012 Josh Boyer <jwboyer@redhat.com>
 - Add patch to enable keyboard backlight on Sony laptops (rhbz 728478)