[oe-commits] org.oe.dev merge of 'ab9b6229419038d1cd565f287223b27e8a0ab406'

[xora commit]

merge of 'ab9b6229419038d1cd565f287223b27e8a0ab406'
     and 'caecf9149b61c5c5db02c83ff3d5d801e1216398'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 58892f8690878f7ed6658262c62e3515f83d248a
ViewMTN: http://monotone.openembedded.org/revision/info/58892f8690878f7ed6658262c62e3515f83d248a
Files:
1
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
Diffs:

#
# mt diff -rab9b6229419038d1cd565f287223b27e8a0ab406 -r58892f8690878f7ed6658262c62e3515f83d248a
#
#
#
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
#  from [1b6f78d896a2edd5402766d2468d39523dfa9732]
#    to [886d3e94bcbd92f2738cd2c11ac93b4e43245191]
#
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko-versions.inc	1b6f78d896a2edd5402766d2468d39523dfa9732
+++ conf/distro/include/angstrom-2007-for-openmoko-versions.inc	886d3e94bcbd92f2738cd2c11ac93b4e43245191
@@ -636,7 +636,7 @@ PREFERRED_VERSION_gtkhtml-3.6 ?= "3.6.2"
 PREFERRED_VERSION_gtkhtml-3.0 ?= "3.0.10"
 PREFERRED_VERSION_gtkhtml-3.1 ?= "3.1.16"
 PREFERRED_VERSION_gtkhtml-3.6 ?= "3.6.2"
-PREFERRED_VERSION_gtkhtml-3.8 ?= "3.8.2"
+PREFERRED_VERSION_gtkhtml-3.8 ?= "3.12.3"
 PREFERRED_VERSION_gtkimageview ?= "1.3.0"
 PREFERRED_VERSION_gtkmathview ?= "0.7.6"
 PREFERRED_VERSION_gtkmm ?= "2.10.10"


#
# mt diff -rcaecf9149b61c5c5db02c83ff3d5d801e1216398 -r58892f8690878f7ed6658262c62e3515f83d248a
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [44e4906ecf7591680ec759d0c7ea0fbc8cbab14a]
#    to [7c0571509d2e4291ba93550d02deaa90af58a9be]
# 
# patch "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
#  from [3b68cb7087ef7eec7a24b4715e803ca816082216]
#    to [1251c42b1b8b4ecdaea05b9eda83b6dc37604eff]
# 
# patch "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4"
#  from [07dc3a97521dab74f9bbe1071d964043851ea50a]
#    to [668b63370db91bbc90e20d8fc70648986af0f35c]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	44e4906ecf7591680ec759d0c7ea0fbc8cbab14a
+++ conf/distro/include/sane-srcrevs.inc	7c0571509d2e4291ba93550d02deaa90af58a9be
@@ -56,7 +56,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1056"
+SRCREV_pn-linux-ixp4xx ?= "1058"
 SRCREV_pn-linux-openmoko ?= "4194"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
============================================================
--- packages/linux/linux-ixp4xx/defconfig-2.6.24.4	3b68cb7087ef7eec7a24b4715e803ca816082216
+++ packages/linux/linux-ixp4xx/defconfig-2.6.24.4	1251c42b1b8b4ecdaea05b9eda83b6dc37604eff
@@ -164,6 +164,7 @@ CONFIG_DMABOUNCE=y
 # IXP4xx Options
 #
 CONFIG_DMABOUNCE=y
+CONFIG_DMABOUNCE_DEBUG=y
 # CONFIG_IXP4XX_INDIRECT_PCI is not set
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_NPE=y
============================================================
--- packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4	07dc3a97521dab74f9bbe1071d964043851ea50a
+++ packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4	668b63370db91bbc90e20d8fc70648986af0f35c
@@ -164,6 +164,7 @@ CONFIG_DMABOUNCE=y
 # IXP4xx Options
 #
 CONFIG_DMABOUNCE=y
+CONFIG_DMABOUNCE_DEBUG=y
 # CONFIG_IXP4XX_INDIRECT_PCI is not set
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_NPE=y