[oe-commits] org.oe.angstrom-2007.12-stable applied changes from edd46f6b477e2a693c84c2ba999b868f23a733f0

[pfalcon commit]

applied changes from edd46f6b477e2a693c84c2ba999b868f23a733f0
             through 4f0260db452e1d17accce2d4d5bdb2c928659a73

h5000.conf: Ship kernel-module-i2c-pxa.
* Spotted by Milan Plzik
* Fixes #2628

Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: a8c948d4153a97b57d3d8edd8a016abebd6b802a
ViewMTN: http://monotone.openembedded.org/revision/info/a8c948d4153a97b57d3d8edd8a016abebd6b802a
Files:
1
conf/machine/h5000.conf
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r1531c8535e06770d5e87478e4a8614904f51e409 -ra8c948d4153a97b57d3d8edd8a016abebd6b802a
#
# 
# 
# patch "conf/machine/h5000.conf"
#  from [b6fb552c41aeff2850cd35e5d3dfb99733e1e56d]
#    to [e03a562f647e39de325cf64e33abb934e96da504]
# 
# patch "packages/tasks/task-base.bb"
#  from [2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb]
#    to [7920168f338a59622e472140c5c9a841ef1244e6]
# 
============================================================
--- conf/machine/h5000.conf	b6fb552c41aeff2850cd35e5d3dfb99733e1e56d
+++ conf/machine/h5000.conf	e03a562f647e39de325cf64e33abb934e96da504
@@ -27,7 +27,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
-			      kernel-module-snd-soc-h5000"
+			      kernel-module-snd-soc-h5000 \
+			      kernel-module-i2c-pxa"
 
 #
 # Modules autoload and other boot properties
============================================================
--- packages/tasks/task-base.bb	2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb
+++ packages/tasks/task-base.bb	7920168f338a59622e472140c5c9a841ef1244e6
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r57"
+PR = "r58"
 
 inherit task