[oe-commits] org.oe.dev htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.

[pfalcon commit]

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

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: b042caec894575c0d01a2647dd795e6c60ea7253
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b042caec894575c0d01a2647dd795e6c60ea7253
Files:
1
conf/machine/htcuniversal.conf
Diffs:

#
# mt diff -r53d64b20113c9b23a5d4825ba78e6facd2a1a506 -rb042caec894575c0d01a2647dd795e6c60ea7253
#
# 
# 
# patch "conf/machine/htcuniversal.conf"
#  from [3c15a3a8e94de46b25fe188d7a1aecdd300a0e53]
#    to [b6348e31a19a1b6ed90a8363bd6a8afb1df20819]
# 
============================================================
--- conf/machine/htcuniversal.conf	3c15a3a8e94de46b25fe188d7a1aecdd300a0e53
+++ conf/machine/htcuniversal.conf	b6348e31a19a1b6ed90a8363bd6a8afb1df20819
@@ -15,15 +15,15 @@ MACHINE_EXTRA_RDEPENDS = "tiinit acx-fir
 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 \
 				"