From 49535424d20ff063236743ddbfa95507fc325829 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@openedhand.com>
Date: Wed, 26 Sep 2007 15:36:02 +0000
Subject: linux-rp-2.6.22+2.6.23-rc4: Added the HTC wifi module to our
 defconfig.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2804 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal       | 8 +++++++-
 meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb                 | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal
index 1a787d4f2..2b0262149 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal
+++ b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23-rc4
-# Tue Sep 11 13:04:28 2007
+# Wed Sep 26 17:55:32 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -561,8 +561,14 @@ CONFIG_NETDEVICES=y
 #
 # Wireless LAN
 #
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+CONFIG_ACX=m
+CONFIG_ACX_MEM=y
+# CONFIG_ACX_CS is not set
+CONFIG_ACX_HTCUNIVERSAL=m
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
diff --git a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
index 118c2ef72..089b458ea 100644
--- a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_htcuniversal = "1"
-- 
cgit v1.2.3