summaryrefslogtreecommitdiff
path: root/conf/machine/collie.conf
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-04-23 16:46:28 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-04-23 16:46:28 +0000
commita9df5ade468b65513a1322184c6ba43e94181d0e (patch)
treea95c739afc1da9f0e012215fc93b49cad9ebbad3 /conf/machine/collie.conf
parente16fb74421e04040417a417208bc9d8e5d01e350 (diff)
parentd9f0c399c1afb4bb50e860370fd3adae82c7d34f (diff)
merge of '6c10e4e698bad3b70189cebcd53c4381ae45b884'
and '909c507b800748c820ddc73a2c5bed204cbdbd65'
Diffstat (limited to 'conf/machine/collie.conf')
-rw-r--r--conf/machine/collie.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c9cfe7744f..429463cc87 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -4,7 +4,7 @@
TARGET_ARCH = "arm"
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
PREFERRED_PROVIDER_xserver = "xserver-kdrive"