Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / conf / beagle.conf

diff --git a/conf/beagle.conf b/conf/beagle.conf
index 8e0b35b..9fb6849 100644 (file)
--- a/conf/beagle.conf
+++ b/conf/beagle.conf
@@ -6,11 +6,18 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules-cs orinoco-modules \
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules "
+BOOTSTRAP_EXTRA_RDEPENDS = " kernel modutils-collateral \
 kernel-module-net-fd \
 kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor \
-kernel-module-pcnet_cs kernel-module-8390"
+kernel-module-pcnet-cs kernel-module-8390 kernel-module-unix  \
+kernel-module-sa1100-ir \
+kernel-module-usb-eth kernel-module-sa1100usb-core \
+kernel-module-ide-cs  kernel-module-ppp-generic kernel-module-mtdchar \
+kernel-module-fat kernel-module-vfat \
+kernel-module-ide-cs kernel-module-ide-disk kernel-module-ide-mod "
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules "
+
 
 # FIXME: the modules list is not complete yet!