[oe-commits] org.oe.dev hx4700.conf: Someone broke hx4700.

[pfalcon commit]

hx4700.conf: Someone broke hx4700.
* Was fun to debug.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e5672c1952268d71a4b25b085fc8e327713f1dc5
ViewMTN: http://monotone.openembedded.org/revision/info/e5672c1952268d71a4b25b085fc8e327713f1dc5
Files:
1
conf/machine/hx4700.conf
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r830ca39e8c1f0e3b49cde6e1667c1e3433bd9867 -re5672c1952268d71a4b25b085fc8e327713f1dc5
#
# 
# 
# patch "conf/machine/hx4700.conf"
#  from [8a9b68dd63f3be8457ae064682536c7c1912b241]
#    to [537fcae072d2c76e87e7f1e735e333ccae1bb34a]
# 
# patch "packages/tasks/task-base.bb"
#  from [4872be5529c6ad0d60f8e5da1753a0fb845910a0]
#    to [d85d25ffbe37f18e4269777fa917583cd172c2e0]
# 
============================================================
--- conf/machine/hx4700.conf	8a9b68dd63f3be8457ae064682536c7c1912b241
+++ conf/machine/hx4700.conf	537fcae072d2c76e87e7f1e735e333ccae1bb34a
@@ -21,7 +21,7 @@ MACHINE_DISPLAY_PPI = "200"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "200"
-MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi vfat"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat"
 MACHINE_FEATURES += "iwmmxt"
 
 #
============================================================
--- packages/tasks/task-base.bb	4872be5529c6ad0d60f8e5da1753a0fb845910a0
+++ packages/tasks/task-base.bb	d85d25ffbe37f18e4269777fa917583cd172c2e0
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r53"
+PR = "r54"
 
 inherit task