From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 6 Aug 2007 11:00:44 +0000 (+0000)
Subject: ixp4xx-kernel: built the ixp4xx-npe module into the kernel, so it can accept a microc... 
X-Git-Tag: Release-2010-05/1~8868^2~1^2^2~4^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39246ac4dc1efaa5b59db8a5b75653e48d553072;p=openembedded.git

ixp4xx-kernel: built the ixp4xx-npe module into the kernel, so it can accept a microcode image found in an MTD partition
---

diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
index 56474d512a..0fbb58a561 100644
--- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
@@ -885,7 +885,7 @@ CONFIG_TUN=m
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
 CONFIG_IXP4XX_QMGR=m
-CONFIG_IXP4XX_NPE=m
+CONFIG_IXP4XX_NPE=y
 CONFIG_IXP4XX_NPE_FW_LOAD=y
 CONFIG_IXP4XX_NPE_FW_MTD=y
 CONFIG_IXP4XX_MAC=m
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
index ff90bcb3b3..b0ba8ba787 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "914"
+IXP4XX_KERNEL_SVN_REV = "915"
 #
 # The directory containing the patches to be applied is
 # specified below