[oe-commits] org.oe.dev merge of '03afc682e2e7c149c0114ac365f028d8a56d6113'

[xora commit]

merge of '03afc682e2e7c149c0114ac365f028d8a56d6113'
     and '699a123deec510ba1589a4e363b4f74bce2f63cc'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: fb5125d70e364a6aa1db0ab80f84a840cc8e6be8
ViewMTN: http://monotone.openembedded.org/revision/info/fb5125d70e364a6aa1db0ab80f84a840cc8e6be8
Files:
1
packages/openmoko2/openmoko-appmanager2_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig
Diffs:

#
# mt diff -r03afc682e2e7c149c0114ac365f028d8a56d6113 -rfb5125d70e364a6aa1db0ab80f84a840cc8e6be8
#
# 
# 
# patch "packages/openmoko2/openmoko-appmanager2_svn.bb"
#  from [cd5979321d700d7dee8025135947a97abe7587da]
#    to [8808bd67fd00d89f7b8ea151d37f6cfd24aba0eb]
# 
============================================================
--- packages/openmoko2/openmoko-appmanager2_svn.bb	cd5979321d700d7dee8025135947a97abe7587da
+++ packages/openmoko2/openmoko-appmanager2_svn.bb	8808bd67fd00d89f7b8ea151d37f6cfd24aba0eb
@@ -5,3 +5,6 @@ inherit openmoko2 
 PR = "r0"
 
 inherit openmoko2 
+
+FILES_${PN} += "/usr/share/openmoko-appmanager"
+


#
# mt diff -r699a123deec510ba1589a4e363b4f74bce2f63cc -rfb5125d70e364a6aa1db0ab80f84a840cc8e6be8
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [03549bc6f28d0c3f8bfa8902fb00c9c9a33d244b]
#    to [20a517059661d41439c3a887c4222a0ecf489389]
# 
# patch "packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig"
#  from [3bfd630e3924e99334533b1cb8ffdce07de96cb7]
#    to [cc15cda7d452e91dd810cf9f70c76ef47053cca7]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	03549bc6f28d0c3f8bfa8902fb00c9c9a33d244b
+++ conf/distro/include/sane-srcrevs.inc	20a517059661d41439c3a887c4222a0ecf489389
@@ -25,7 +25,7 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-libmokoui2 ?= "3111"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-linux-bfin ?= "3727"
+SRCREV_pn-linux-bfin ?= "3731"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
============================================================
--- packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig	3bfd630e3924e99334533b1cb8ffdce07de96cb7
+++ packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig	cc15cda7d452e91dd810cf9f70c76ef47053cca7
@@ -993,7 +993,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_MTOUCH=m