summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2006-03-23 10:21:51 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-23 10:21:51 +0000
commit22a883bce5ed668de572d430ac5a03ece16f0458 (patch)
tree63be2d1736173cc0170e931e8ad2cebd70ce90bd /conf
parentae32413b51068d64de75322bbfe0e086bbac92f7 (diff)
parentda4bffff736d1ced81a4d169d218818c60587054 (diff)
merge of 1a896e8bc4995403afa45f684796b5d56c8e5198
and 4e45961e2b4e4c3455a9d567510fc4a19841bbe5
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom.conf2
-rw-r--r--conf/machine/include/tosa-2.6.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index c63a5c53b7..d8b97001c9 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -9,7 +9,7 @@ DISTRO_NAME = "Angstrom"
ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom"
#Set the default maintainer to angstrom-dev
-MAINTAINER ?= "Angstrom Developers <angstrom-dev@handhelds.org>"
+MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
#use ipkg package format with debian style naming
INHERIT += "package_ipk debian"
diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
index c80faa4a7c..c7805c36fe 100644
--- a/conf/machine/include/tosa-2.6.conf
+++ b/conf/machine/include/tosa-2.6.conf
@@ -1,4 +1,6 @@
include conf/machine/include/zaurus-clamshell-2.6.conf
+# wlan-ng Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
# WM97xx Modules
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"