summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2006-10-16 14:21:57 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2006-10-16 14:21:57 +0000
commit1ca416bbbd5d3fc18db8ffede91bef0db8138385 (patch)
treea7e251e90ac4e87e9e942589d98b780d226baeac
parent203719dad839e2eced14a5c8789f402d10e4b74e (diff)
disapproval of revision 'b8e69aa20c2c86ec586299ba3d7ce6ec57b7ef8e'
-rw-r--r--conf/machine/h2200.conf1
-rw-r--r--conf/machine/h4000.conf1
-rw-r--r--conf/machine/hx2000.conf1
-rw-r--r--conf/machine/hx4700.conf2
4 files changed, 5 insertions, 0 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 863a45433c..467c0c0e81 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -18,6 +18,7 @@ GUI_MACHINE_CLASS = "smallscreen"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
# Software/package selection
+PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 6f696bd999..17bb47811a 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -13,6 +13,7 @@ GUI_MACHINE_CLASS = "smallscreen"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
# Software/package selection
+PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 4722c83e06..b0c962c1d0 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -21,6 +21,7 @@ MODUTILS = "26"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
+PCMCIA_MANAGER = "pcmciautils"
BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)}"
BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 0029ae8981..fad812759b 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -20,6 +20,8 @@ MODUTILS = "26"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
+PCMCIA_MANAGER = "pcmciautils"
+
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls_cp437 \
kernel-module-nls_iso8859-1 \