[kernel] r14702 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Sun Nov 29 22:48:35 2009
New Revision: 14702

Log:
Reenable accidentally omitted drivers, thanks to Uwe Kleine-König (Closes: #558011)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Nov 29 22:27:32 2009	(r14701)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Nov 29 22:48:35 2009	(r14702)
@@ -15,6 +15,14 @@
   * Move contents of linux-support package to /usr/share.
   * Make linux-patch package depend against python.
   * Use python-support instead of python-central.
+  
+  [ Ben Hutchings ]
+  * Reenable accidentally omitted drivers, thanks to Uwe Kleine-König
+    (Closes: #558011):
+    - Atheros wireless drivers (ar9170, ath5k, ath9k)
+    - TI wl12xx wireless drivers (wl1251_spi, wl1251_sdio and wl1271
+      replace wl12xx)
+    - Silicon Labs Si470x FM Radio Receiver driver (radio-usb-si470x)
 
  -- Martin Michlmayr <tbm at cyrius.com>  Sun, 22 Nov 2009 13:56:12 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Nov 29 22:27:32 2009	(r14701)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Nov 29 22:48:35 2009	(r14702)
@@ -854,6 +854,7 @@
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_USB_MR800=m
 CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SI470X=y
 
 ##
 ## file: drivers/media/radio/si470x/Kconfig
@@ -1564,6 +1565,11 @@
 CONFIG_MWL8K=m
 
 ##
+## file: drivers/net/wireless/ath/Kconfig
+##
+CONFIG_ATH_COMMON=m
+
+##
 ## file: drivers/net/wireless/ath/ar9170/Kconfig
 ##
 CONFIG_AR9170_USB=m
@@ -1669,6 +1675,10 @@
 ## file: drivers/net/wireless/wl12xx/Kconfig
 ##
 CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL1271=m
 
 ##
 ## file: drivers/net/wireless/zd1211rw/Kconfig