diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-07-01 12:49:11 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-07-01 12:49:11 +0200 |
| commit | 2184b2862fd610efa771eac6364bbfe330684553 (patch) | |
| tree | a761b1d028c82db0f657dd348c4daa80953bb8ea /conf | |
| parent | 6d13b52b667b3318b1da6522d462532649907a18 (diff) | |
| parent | 81531b3915b61faf3f449bc00f01e3f8e14b48b0 (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" |