summaryrefslogtreecommitdiff
path: root/recipes/linux
diff options
context:
space:
mode:
authorBernhard Guillon <Bernhard.Guillon@opensimpad.org>2010-02-26 08:22:28 +0000
committerMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2010-02-26 20:07:32 +0100
commit9ac4de8c015c991b8210bdea9bb472633110c268 (patch)
tree78ec0d796c160be0f6cc60cb0f0506a53ac518e3 /recipes/linux
parent4372ec830acc84a51947ad0dba51484977d9e801 (diff)
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>
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux/atngw100/defconfig2
-rw-r--r--recipes/linux/linux_2.6.29.bb2
2 files changed, 2 insertions, 2 deletions
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"