[oe-commits] Bernhard Guillon : linux: atngw100 - add bridge module to defconfig, bump PR

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 9ac4de8c015c991b8210bdea9bb472633110c268
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9ac4de8c015c991b8210bdea9bb472633110c268

Author: Bernhard Guillon <Bernhard.Guillon at opensimpad.org>
Date:   Fri Feb 26 08:22:28 2010 +0000

linux: atngw100 - add bridge module to defconfig, bump PR

Signed-off-by: Bernhard Guillon <Bernhard.Guillon at opensimpad.org>
Acked-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>

---

 recipes/linux/linux/atngw100/defconfig |    2 +-
 recipes/linux/linux_2.6.29.bb          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/linux/linux/atngw100/defconfig b/recipes/linux/linux/atngw100/defconfig
index 489d094..b54fca1 100644
--- a/recipes/linux/linux/atngw100/defconfig
+++ b/recipes/linux/linux/atngw100/defconfig
@@ -489,7 +489,7 @@ CONFIG_IP6_NF_RAW=m
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=m
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb
index 240faf2..33f0eda 100644
--- a/recipes/linux/linux_2.6.29.bb
+++ b/recipes/linux/linux_2.6.29.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r10"
+PR = "r11"
 
 S = "${WORKDIR}/linux-2.6.29"