4 files changed, 5 insertions, 3 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index b86a6f90bb..bfa3689e7a 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1476,7 +1476,7 @@ PREFERRED_VERSION_proj-4-native ?= "4.9"
 PREFERRED_VERSION_psmisc ?= "22.2"
 PREFERRED_VERSION_psplash-zap ?= "1.0"
 PREFERRED_VERSION_pth ?= "2.0.2"
-PREFERRED_VERSION_pulseaudio ?= "0.9.9"
+PREFERRED_VERSION_pulseaudio ?= "0.9.10"
 PREFERRED_VERSION_puppy ?= "1.11"
 PREFERRED_VERSION_puzz-le ?= "2.0.0"
 PREFERRED_VERSION_puzzles ?= "r7436"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 0d3a9bbcf0..785214409f 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -8,6 +8,8 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
+IMAGE_FSTYPES += "jffs2"
+
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 09c382f376..190d1d1049 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 3b9ed1b468..45dc0518a4 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"