summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2007-11-12 08:56:51 +0000
committerGraeme Gregory <dp@xora.org.uk>2007-11-12 08:56:51 +0000
commit596fc35108418397b70d1c2b3b86cd0c304edcaf (patch)
tree0a29548d016288feedbcd89331cab98262f7576b /conf
parentbb0e4528f26c38f41123cc42ff52edef86429645 (diff)
parent6879d344a341adfef424ddecb71133a1bf16c1fd (diff)
merge of '29ae1b3a205c9c321b38dd5f8946f42ed50afbd8'
and 'd7e830ff3c589d924990fe6ee78d4b99697d3525'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/simpad.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 3b527293df..ab3da912ba 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -2,7 +2,7 @@
#@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
#@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
TARGET_ARCH = "arm"