diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
| commit | 4ee358534793381d2e87b01781079a3354fd5c1c (patch) | |
| tree | 729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /conf/machine/rx1950.conf | |
| parent | beb17e26ee9b4bc0cf334c3b30560c6eb66b1299 (diff) | |
| parent | eda06ec3dde6169a46797f876a82499c4fff8f62 (diff) | |
| download | openembedded-324a7c75ac7f591e950836686bfe14332ce6586b.tar.gz | |
Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13
Diffstat (limited to 'conf/machine/rx1950.conf')
| -rw-r--r-- | conf/machine/rx1950.conf | 12 |
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 |