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

[Ben Hutchings]

Author: benh
Date: Mon May 30 21:19:58 2011
New Revision: 17503

Log:
net/wireless/ath: Enable CARL9170 as module (carl9170, replacing ar9170usb)

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	Mon May 30 21:15:58 2011	(r17502)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 21:19:58 2011	(r17503)
@@ -26,6 +26,8 @@
   * dm: Enable DM_RAID, DM_FLAKEY as modules. Note these are currently
     experimental.
   * target: Enable TCM_FC as module
+  * net/wireless/ath: Enable CARL9170 as module (carl9170, replacing
+    ar9170usb)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 30 21:15:58 2011	(r17502)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 30 21:19:58 2011	(r17503)
@@ -1859,11 +1859,6 @@
 # CONFIG_ATH_DEBUG is not set
 
 ##
-## file: drivers/net/wireless/ath/ar9170/Kconfig
-##
-CONFIG_AR9170_USB=m
-
-##
 ## file: drivers/net/wireless/ath/ath5k/Kconfig
 ##
 CONFIG_ATH5K=m
@@ -1882,6 +1877,13 @@
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 
 ##
+## file: drivers/net/wireless/ath/carl9170/Kconfig
+##
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+
+##
 ## file: drivers/net/wireless/b43/Kconfig
 ##
 CONFIG_B43=m