From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Fri, 10 Sep 2010 10:54:14 +0000 (+0000)
Subject: rx1950: change default kernel to linux-2.6.35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=631e3bf70c4beea7092cb33d222fc00bf5f96db4;p=openembedded.git

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>
---

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