diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-10-17 18:37:18 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-10-17 18:37:18 +0000 |
| commit | 1db82e21cfdf7088821985aaf0c2f83ac80c7f0b (patch) | |
| tree | edc5e0ccb2ac56d383b0f8e9dc08ed92dffa4861 | |
| parent | 5730a399e4b393861802da84f1417ce840db73c1 (diff) | |
htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.
| -rw-r--r-- | conf/machine/htcuniversal.conf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 0af0a55623..7c0710d6f1 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,15 +15,15 @@ MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscree MODUTILS = "26" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls_cp437 \ - kernel-module-nls_iso8859-1 \ - kernel-module-nls_utf8 \ - kernel-module-af_key \ - kernel-module-bsd_comp \ +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-utf8 \ + kernel-module-af-key \ + kernel-module-bsd-comp \ kernel-module-i2c-pxa \ - kernel-module-htcuniversal_power \ - kernel-module-snd-htcuniversal_audio \ - kernel-module-htcuniversal_acx \ + kernel-module-htcuniversal-power \ + kernel-module-snd-htcuniversal-audio \ + kernel-module-htcuniversal-acx \ kernel-module-acx \ " |