summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-02-03 00:13:43 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-02-03 00:13:43 +0000
commit05d160f70bd8dd3cafdac0d9824c79495be2e6f2 (patch)
treece7f936bbd876f3b12c04eef66bb2058fe6b5f06
parent008a8b2d36ff42916ccc1b84aadef456785019e2 (diff)
parent2fe159ef1343244bea79fba1d0050b5b420a54db (diff)
merge of 'bb3574ca77780e28d3528182eaeb7cda963c4974'
and 'eea0b13e3079e07cf547a5690026863e07e011bf'
-rw-r--r--conf/machine/h5000.conf3
-rw-r--r--packages/tasks/task-base.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index c4c1237bae..1f29438061 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -27,7 +27,8 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf
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
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index a44056f316..f8a94c63b2 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r58"
+PR = "r59"
inherit task