From eaefa2601b8f47f6c27a6cf871517160971e2e2b Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 17 Jan 2008 23:13:41 +0000
Subject: linux-rp-2.6.23: Tweak defconfigs to save a little space after a
 suggestion from Samuel

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3512 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/linux/linux-rp-2.6.23/defconfig-akita |  2 +-
 .../linux/linux-rp-2.6.23/defconfig-bootcdx86      |  2 +-
 meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 |  2 +-
 .../linux/linux-rp-2.6.23/defconfig-htcuniversal   |  2 +-
 .../linux/linux-rp-2.6.23/defconfig-hx2000         |  2 +-
 .../linux/linux-rp-2.6.23/defconfig-poodle         | 31 ++++++++++++++++++----
 .../linux/linux-rp-2.6.23/defconfig-qemuarm        |  2 +-
 .../linux/linux-rp-2.6.23/defconfig-qemux86        |  2 +-
 .../packages/linux/linux-rp-2.6.23/defconfig-spitz |  2 +-
 meta/packages/linux/linux-rp-2.6.23/defconfig-tosa |  2 +-
 .../linux/linux-rp-2.6.23/defconfig-zylonite       |  2 +-
 meta/packages/linux/linux-rp_2.6.23.bb             |  2 +-
 12 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita
index 1acaa06482..9587fb2a23 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita
@@ -288,7 +288,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
index 23ae307b14..e8852205e5 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
@@ -314,7 +314,7 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0
index 7e8b5d68c7..ff5562fdf5 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0
@@ -302,7 +302,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
index 90147e15f7..ead49c2c8a 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
@@ -294,7 +294,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000
index bb4bbaf145..09ce9e5740 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000
@@ -255,7 +255,7 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
index 027de57904..0f29f18573 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
@@ -523,15 +523,18 @@ CONFIG_BT_HCIVHCI=m
 #
 # Wireless
 #
-# CONFIG_CFG80211 is not set
+CONFIG_CFG80211=m
 CONFIG_WIRELESS_EXT=y
-# CONFIG_MAC80211 is not set
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
-# CONFIG_IEEE80211_SOFTMAC is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -738,7 +741,22 @@ CONFIG_NETDEV_10000=y
 # Wireless LAN
 #
 # CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+CONFIG_WLAN_80211=y
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_LIBERTAS is not set
+CONFIG_HERMES=m
+# CONFIG_ATMEL is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_RTL8187 is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_CS=m
+# CONFIG_ZD1211RW is not set
 
 #
 # USB Network Adapters
@@ -1136,11 +1154,14 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # System on Chip audio support
 #
 CONFIG_SND_SOC=m
-# CONFIG_SND_PXA2XX_SOC is not set
+CONFIG_SND_PXA2XX_SOC=m
+CONFIG_SND_PXA2XX_SOC_I2S=m
+CONFIG_SND_PXA2XX_SOC_POODLE=m
 
 #
 # SoC Audio support for SuperH
 #
+CONFIG_SND_SOC_WM8731=m
 
 #
 # Open Sound System
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm
index e8e2ed01e2..41733b1180 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm
@@ -264,7 +264,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
index 626e1e36ff..5bc9a9ec26 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
@@ -304,7 +304,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
index 4eed9ada4b..a18218f2d1 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
@@ -288,7 +288,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa
index b62db69f95..5173e242a8 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa
@@ -244,7 +244,7 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
index 13fd6e3886..8be4a3bd47 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
@@ -271,7 +271,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_PACKET is not set
+CONFIG_PACKET=m
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb
index 12f01da00b..2de4ad0cf2 100644
--- a/meta/packages/linux/linux-rp_2.6.23.bb
+++ b/meta/packages/linux/linux-rp_2.6.23.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r24"
+PR = "r25"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
-- 
cgit v1.2.3-54-g00ecf