diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-02-05 13:34:45 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-02-05 13:34:45 +0000 |
commit | 4f349bdd5dd605248c9825c396c168f2bf5c38b6 (patch) | |
tree | d6f6822815ffb67fe0f3fa5a930776b9f23c4151 | |
parent | ba1f922665354b80da5e8636097cafaa7b2f91ee (diff) | |
parent | baaba6900900fe9815089d25270665899e2576a6 (diff) |
merge of '47b75b678cf4bede24082e551e04f186734a008c'
and '647847c7187d536c71adab58568757d34b048ac2'
-rw-r--r-- | conf/machine/h5000.conf | 1 | ||||
-rw-r--r-- | packages/tasks/task-base.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 1f29438061..e795395534 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -27,6 +27,7 @@ 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-h5400-bt \ kernel-module-snd-soc-h5000 \ kernel-module-i2c-pxa" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index f8a94c63b2..b5b3e82f70 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 = "r59" +PR = "r60" inherit task |