From: Bernhard Guillon <Bernhard.Guillon@opensimpad.org>
Date: Fri, 26 Feb 2010 08:22:28 +0000 (+0000)
Subject: linux: atngw100 - add bridge module to defconfig, bump PR
X-Git-Tag: Release-2010-05/1~491^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ac4de8c015c991b8210bdea9bb472633110c268;p=openembedded.git

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

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

diff --git a/recipes/linux/linux/atngw100/defconfig b/recipes/linux/linux/atngw100/defconfig
index 489d094f3c..b54fca13dd 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 240faf224d..33f0eda267 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"