summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf2
-rw-r--r--conf/machine/h4000.conf4
-rw-r--r--conf/machine/htcblueangel.conf2
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index d4a40eddba..5fa414d2b4 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -127,7 +127,7 @@ MACHINE_KERNEL_VERSION = "2.6"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh10"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh11"
PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20"
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 \