2.6.38: Let mac80211 select CONFIG_AVERAGE

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25818 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 23 insertions, 37 deletions

diff --git a/target/linux/generic/patches-2.6.38/982-make-config-average-selectable.patch b/target/linux/generic/patches-2.6.38/982-make-config-average-selectable.patch
new file mode 100644
index 0000000000..a87d269c02
--- /dev/null
+++ b/target/linux/generic/patches-2.6.38/982-make-config-average-selectable.patch
@@ -0,0 +1,19 @@
+Index: linux-2.6.38-rc6/lib/Kconfig
+===================================================================
+--- linux-2.6.38-rc6.orig/lib/Kconfig	2011-03-01 19:24:16.246703947 +0100
++++ linux-2.6.38-rc6/lib/Kconfig	2011-03-01 19:26:58.696312483 +0100
+@@ -223,6 +223,13 @@ config LRU_CACHE
+ 	tristate
+ 
+ config AVERAGE
+-	bool
++	bool "Averaging functions"
++	help
++	  This option is provided for the case where no in-kernel-tree
++	  modules require averaging functions, but a module built outside
++	  the kernel tree does. Such modules that use library averaging
++	  functions require Y here.
++
++	  If unsure, say N.
+ 
+ endmenu
diff --git a/target/linux/omap24xx/config-2.6.38 b/target/linux/omap24xx/config-2.6.38
index 46aa31e7aa..a95ce1d580 100644
--- a/target/linux/omap24xx/config-2.6.38
+++ b/target/linux/omap24xx/config-2.6.38
@@ -72,9 +72,8 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_ARPD is not set
 CONFIG_ATAGS_PROC=y
-# CONFIG_ATH_COMMON is not set
 # CONFIG_AUTO_IRQ_AFFINITY is not set
-CONFIG_AVERAGE=y
+# CONFIG_AVERAGE is not set
 CONFIG_BINFMT_MISC=y
 # CONFIG_BKL is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -103,13 +102,6 @@ CONFIG_CBUS_RETU_WDT=y
 CONFIG_CBUS_TAHVO=y
 # CONFIG_CBUS_TAHVO_USB is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CFG80211=m
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_WEXT=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootfstype=ext4,ext3,ext2,squashfs,jffs2 console=tty0 console=ttyO2,115200n8 earlyprintk"
 CONFIG_CMDLINE_FORCE=y
@@ -176,6 +168,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_FS is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_CFQ=y
@@ -329,7 +322,6 @@ CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_RC5_SZ_DECODER=m
 # CONFIG_ISDN is not set
 # CONFIG_ISP1301_OMAP is not set
-# CONFIG_IWM is not set
 CONFIG_JBD2=y
 CONFIG_JFFS2_LZO=y
 CONFIG_JFFS2_ZLIB=y
@@ -369,7 +361,6 @@ CONFIG_KEYS=y
 # CONFIG_LEDS_REGULATOR is not set
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LIB80211=m
 CONFIG_LIRC=m
 # CONFIG_LIS3L02DQ is not set
 CONFIG_LLC=m
@@ -377,24 +368,6 @@ CONFIG_LOCKD=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_MAC80211=m
-# CONFIG_MAC80211_DEBUGFS is not set
-CONFIG_MAC80211_DEBUG_MENU=y
-CONFIG_MAC80211_HAS_RC=y
-# CONFIG_MAC80211_HT_DEBUG is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_MAC80211_IBSS_DEBUG is not set
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_NOINLINE is not set
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_PID is not set
-# CONFIG_MAC80211_TKIP_DEBUG is not set
-# CONFIG_MAC80211_VERBOSE_DEBUG is not set
-# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
 CONFIG_MACH_NOKIA_N800=y
 CONFIG_MACH_NOKIA_N810=y
 CONFIG_MACH_NOKIA_N810_WIMAX=y
@@ -478,7 +451,6 @@ CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_V4_1=y
-# CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLS=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NO_HZ=y
@@ -545,10 +517,7 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
 CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RTL8192CE is not set
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SDIO_UART is not set
@@ -658,7 +627,6 @@ CONFIG_USB_ETH=m
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_M66592 is not set
@@ -717,10 +685,9 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_W35UND is not set
 CONFIG_WATCHDOG_NOWAYOUT=y
-# CONFIG_WL1251 is not set
-# CONFIG_WL12XX_MENU is not set
+# CONFIG_WEXT_PRIV is not set
+# CONFIG_WEXT_SPY is not set
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_BCJ=y