diff options
author | Samuel Ortiz <sameo@openedhand.com> | 2007-09-26 15:36:02 +0000 |
---|---|---|
committer | Samuel Ortiz <sameo@openedhand.com> | 2007-09-26 15:36:02 +0000 |
commit | 49535424d20ff063236743ddbfa95507fc325829 (patch) | |
tree | 718bffdf90040ecc0366d494ccd8caa56076a596 /meta/packages/linux | |
parent | 55c49b85fd65c801fd8366c38e099207fd564175 (diff) | |
download | poky-49535424d20ff063236743ddbfa95507fc325829.tar.gz |
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
Diffstat (limited to 'meta/packages/linux')
-rw-r--r-- | meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal | 8 | ||||
-rw-r--r-- | meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb | 2 |
2 files changed, 8 insertions, 2 deletions
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 1a787d4f23..2b02621499 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 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.23-rc4 | 3 | # Linux kernel version: 2.6.23-rc4 |
4 | # Tue Sep 11 13:04:28 2007 | 4 | # Wed Sep 26 17:55:32 2007 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -561,8 +561,14 @@ CONFIG_NETDEVICES=y | |||
561 | # | 561 | # |
562 | # Wireless LAN | 562 | # Wireless LAN |
563 | # | 563 | # |
564 | CONFIG_NET_RADIO=y | ||
565 | # CONFIG_NET_WIRELESS_RTNETLINK is not set | ||
564 | # CONFIG_WLAN_PRE80211 is not set | 566 | # CONFIG_WLAN_PRE80211 is not set |
565 | # CONFIG_WLAN_80211 is not set | 567 | # CONFIG_WLAN_80211 is not set |
568 | CONFIG_ACX=m | ||
569 | CONFIG_ACX_MEM=y | ||
570 | # CONFIG_ACX_CS is not set | ||
571 | CONFIG_ACX_HTCUNIVERSAL=m | ||
566 | # CONFIG_WAN is not set | 572 | # CONFIG_WAN is not set |
567 | CONFIG_PPP=m | 573 | CONFIG_PPP=m |
568 | # CONFIG_PPP_MULTILINK is not set | 574 | # 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 118c2ef72e..089b458ea4 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 @@ | |||
1 | require linux-rp.inc | 1 | require linux-rp.inc |
2 | 2 | ||
3 | PR = "r3" | 3 | PR = "r4" |
4 | 4 | ||
5 | DEFAULT_PREFERENCE = "-1" | 5 | DEFAULT_PREFERENCE = "-1" |
6 | DEFAULT_PREFERENCE_htcuniversal = "1" | 6 | DEFAULT_PREFERENCE_htcuniversal = "1" |