summaryrefslogtreecommitdiff
path: root/conf/machine/include
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/handheld-common.conf2
-rw-r--r--conf/machine/include/zaurus-clamshell-2.6.conf4
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index fbecc6e25c..f8767d2ddf 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -16,8 +16,6 @@ irda irlan irnet irport irtty ircomm-tty \
input uinput \
"
-PCMCIA_MANAGER ?= "pcmcia-cs"
-
# Configuration bits for "generic handheld"
BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index f5d7602699..e73028d7ee 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -4,8 +4,10 @@
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
PREFERRED_VERSION_wpa_supplicant = "0.4.7"
+PCMCIA_MANAGER ?= "pcmciautils"
+
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
# Ethernet modules