summaryrefslogtreecommitdiff
path: root/conf/machine/h3900.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/h3900.conf')
-rw-r--r--conf/machine/h3900.conf8
1 files changed, 3 insertions, 5 deletions
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 65cce6ce81..61024584b5 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -5,7 +5,7 @@
KERNEL ?= "kernel24"
#KERNEL ?= "kernel26"
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
OVERRIDES =. "${KERNEL}:"
@@ -13,7 +13,7 @@ TARGET_ARCH = "arm"
IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6"
EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
ROOT_FLASH_SIZE = "32"
@@ -30,10 +30,8 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
USE_DEVFS_kernel24 = "1"
USE_VT = "0"
-include conf/machine/include/ipaq-common.conf
-include conf/machine/include/handheld-common.conf
GUI_MACHINE_CLASS = "smallscreen"
# not using tune-xscale so as to retain backwards compatibility
-include conf/machine/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf