diff options
| author | Elena Grandi <elena.valhalla@gmail.com> | 2009-07-01 12:57:46 +0200 |
|---|---|---|
| committer | Elena Grandi <elena.valhalla@gmail.com> | 2009-07-01 12:57:46 +0200 |
| commit | 6b8d5b4320e7b08c7b80665f72d8a47d72dd2535 (patch) | |
| tree | 80b4d165f34bb3bb658927d4e92043031fa72bb6 /conf | |
| parent | 645418b10be153f65ef42e0e2158f89d2618536f (diff) | |
| parent | 2184b2862fd610efa771eac6364bbfe330684553 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/tx25.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/tx25.conf b/conf/machine/tx25.conf index abe1135dce..8ec67b0ce6 100644 --- a/conf/machine/tx25.conf +++ b/conf/machine/tx25.conf @@ -9,7 +9,7 @@ MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camer GUI_MACHINE_CLASS = "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux = "2.6.30-rc4" +PREFERRED_VERSION_linux = "2.6.29+2.6.30-rc4" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" |