Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/01 23:08:07+00:00 reciva.com!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mebius.reciva.com:/home/pb/oe/oe

2005/03/01 23:07:47+00:00 reciva.com!pb
use atmelwlandriver, not pcmf502rd/pcmf502re, in IPAQ_MODULES

BKrev: 4224fd5dc3U3tvZFCVQA_W_jsThobw

diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index f0aaedc..1b55875 100644 (file)
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,4 +1,4 @@
-IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
 BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}')}"