linux-rp: sync Akita defconfig from 2.6.23 to 2.6.24-rc1

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3038 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc1/defconfig-akita b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc1/defconfig-akita
index 59ec5c95b72ad052e1f409dc2b838744476508b2..7d9adaf0e33509b37d532a349ae470496622c5be 100644 (file)
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc1/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc1/defconfig-akita
@@ -677,8 +677,24 @@ CONFIG_MII=m
 #
 # Wireless LAN
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+CONFIG_WLAN_PRE80211=y
+# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE 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=m
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_CS=m
 
 #
 # USB Network Adapters
@@ -989,7 +1005,7 @@ CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_PXA=y
 CONFIG_FB_PXA_LCD_QVGA=y
 # CONFIG_FB_PXA_LCD_VGA is not set
-# CONFIG_FB_PXA_OVERLAY is not set
+CONFIG_FB_PXA_OVERLAY=y
 # CONFIG_FB_PXA_PARAMETERS is not set
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_W100 is not set

diff --git a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc1.bb b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc1.bb
index d73f528892c8d6321bcc6c658c89520d406370ff..bcf85d6df006f3337beaf672bfb6f432a52c91bb 100644 (file)
--- a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc1.bb
+++ b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc1.bb
@@ -1,5 +1,7 @@
 require linux-rp.inc
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 # Handy URLs