summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2010-09-10 10:54:14 +0000
committerEric Bénard <eric@eukrea.com>2010-09-11 18:58:27 +0200
commit631e3bf70c4beea7092cb33d222fc00bf5f96db4 (patch)
tree0d59511f44676196527d5a0a4593f5188b452634
parent7e92d21ca7b6e6685c80243d3b09c06aedaa3354 (diff)
rx1950: change default kernel to linux-2.6.35
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r--conf/machine/rx1950.conf12
1 files changed, 2 insertions, 10 deletions
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
index fb70437bd8..d43a2dc8db 100644
--- a/conf/machine/rx1950.conf
+++ b/conf/machine/rx1950.conf
@@ -20,17 +20,9 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda wifi usbgadget screen vfa
#
# Software/packages selection
#
-PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.35"
PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-#
-# Modules autoload and other boot properties
-#
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_g_ether = "g_ether"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
-
-require conf/machine/include/LAB-settings.inc