simpad: merge simpad-2.6.inc in simpad.conf

diff --git a/conf/machine/include/simpad-2.6.inc b/conf/machine/include/simpad-2.6.inc
deleted file mode 100644 (file)
index e485c7b..0000000
--- a/conf/machine/include/simpad-2.6.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-MACHINE_FEATURES_append = "kernel26"

diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 5e89292..eb22f68 100644 (file)
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -6,11 +6,12 @@ MACHINE_KERNEL_VERSION ?= "2.6"
 
 TARGET_ARCH = "arm"
 
-MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
+MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat kernel26"
 
-include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm.inc
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PCMCIA_MANAGER ?= "pcmciautils"
 
+require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "16"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000"