diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-04-14 15:58:17 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-14 15:58:17 +0200 |
| commit | 52b2c9f92fb3adbe5a0f01dac114e901e8272d65 (patch) | |
| tree | f1b71a37bdefa4c45ccdfae7ed1d3632dca051b9 /conf/machine | |
| parent | 9f42f9491837260d09a11ce05638a383776e0451 (diff) | |
| parent | ff97dad855526c3b28d8064582a7eea4c31c0602 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/atngw100.conf | 1 | ||||
| -rw-r--r-- | conf/machine/palmt650.conf | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index ecfd2d4fee..f82d446d68 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -5,7 +5,6 @@ TARGET_ARCH = "avr32" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index 272c0dca1c..f81ade3d2e 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -12,6 +12,9 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \ kernel-module-pxa27x-keyboard \ - kernel-module-wm97xx-ts" + kernel-module-wm97xx-ts \ + " + +MACHINE_EXTRA_RDEPENDS += "palmt650-keyboard-modmap" module_autoload_g_ether = "g_ether" |