[oe-commits] org.oe.dev merge of '325cca716bfbf3db0f668af761161a7b40a705e8'

[koen commit]

merge of '325cca716bfbf3db0f668af761161a7b40a705e8'
     and 'ea9bece0e1c09d6d7e85904db6d8adeb4f4588c2'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d0e1737d5800eb177d81462b5591d949d70676d7
ViewMTN: http://monotone.openembedded.org/revision/info/d0e1737d5800eb177d81462b5591d949d70676d7
Files:
1
conf/distro/include/sane-srcrevs.inc
conf/machine/davinci-dvevm.conf
conf/machine/davinci-sffsdr.conf
Diffs:

#
# mt diff -r325cca716bfbf3db0f668af761161a7b40a705e8 -rd0e1737d5800eb177d81462b5591d949d70676d7
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [337718e35e20ddb11e0cbf618f12f0c7818e3405]
#    to [6d5bc1b8492128dba5438635e85ece76202ee397]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	337718e35e20ddb11e0cbf618f12f0c7818e3405
+++ conf/distro/include/sane-srcrevs.inc	6d5bc1b8492128dba5438635e85ece76202ee397
@@ -142,7 +142,7 @@ SRCREV_pn-openmoko-tasks ?= "320"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
 SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "398"
+SRCREV_pn-openmoko-tasks2 ?= "399"
 SRCREV_pn-openmoko-terminal2 ?= "4039"
 SRCREV_pn-openmoko-theme-standard ?= "4167"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "4167"


#
# mt diff -rea9bece0e1c09d6d7e85904db6d8adeb4f4588c2 -rd0e1737d5800eb177d81462b5591d949d70676d7
#
#
#
# patch "conf/machine/davinci-dvevm.conf"
#  from [9530fb28d85fd4598e3dbdb4fbae20cda4e983e5]
#    to [fc1df96b8886e6db104be2687885c7947b76452d]
# 
# patch "conf/machine/davinci-sffsdr.conf"
#  from [3b4784ac301d7f628129f269d9e9420fe71d44be]
#    to [be522fecc7b21c6304b0e1afb6a2572c608667a7]
#
============================================================
--- conf/machine/davinci-dvevm.conf	9530fb28d85fd4598e3dbdb4fbae20cda4e983e5
+++ conf/machine/davinci-dvevm.conf	fc1df96b8886e6db104be2687885c7947b76452d
@@ -22,5 +22,7 @@ MACHINE_FEATURES = "kernel26 pcmcia usbh
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
 
+MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
+
 require conf/machine/include/tune-arm926ejs.inc
 
============================================================
--- conf/machine/davinci-sffsdr.conf	3b4784ac301d7f628129f269d9e9420fe71d44be
+++ conf/machine/davinci-sffsdr.conf	be522fecc7b21c6304b0e1afb6a2572c608667a7
@@ -25,5 +25,7 @@ MACHINE_FEATURES = "kernel26 serial"
 
 MACHINE_FEATURES = "kernel26 serial"
 
+MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
+
 require conf/machine/include/tune-arm926ejs.inc