summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-07-10 19:20:07 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-07-10 19:20:07 +0000
commit0de0a257a21d04a65147eee888d4ea6be84b71a3 (patch)
tree2e7a17a37f444aca52a869ae38b132e907027dc8 /conf/machine
parentb637757122ebc8d238076b894c05a5d0bb2bd416 (diff)
parent5bee16dc1ce3c3b02455b3e6d0c15cbb285d8361 (diff)
merge of '79a8be76eb7e634035b02729b67f9179fabb8711'
and '9b3f781313b3e47faa28044336efce829a2c5a40'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/h4000.conf4
-rw-r--r--conf/machine/htcblueangel.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index cd6a6dd6a1..5aeab899b3 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf
ROOT_FLASH_SIZE = "32"
VOLATILE_STORAGE_SIZE = "64"
GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
#
# Software/packages selection
@@ -22,7 +22,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
kernel-module-i2c-pxa \
kernel-module-acx \
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 77bb0b5639..5f2814844d 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -23,7 +23,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-MACHINE_EXTRA_RDEPENDS = "acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "acx-firmware ${PCMCIA_MANAGER}"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-blueangel_pcmcia \
kernel-module-blueangel_audio \
kernel-module-blueangel_rom \