From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 17 Oct 2006 18:37:18 +0000 (+0000)
Subject: htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.
X-Git-Tag: Release-2010-05/1~9453^2~567^2~122^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1db82e21cfdf7088821985aaf0c2f83ac80c7f0b;p=openembedded.git

htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.
---

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 \
 				"