[kernel] r14797 - in dists/trunk/linux-2.6/debian: . config/armel

[Martin Michlmayr]

Author: tbm
Date: Fri Dec 18 15:34:55 2009
New Revision: 14797

Log:
Build MTD_CFI_AMDSTD into the kernel again since
it's needed on the D-Link DNS-323 (thanks Manuel Roeder).

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.orion5x

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Dec 17 05:29:53 2009	(r14796)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Dec 18 15:34:55 2009	(r14797)
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.32-3) UNRELEASED; urgency=high
+
+  [ Martin Michlmayr ]
+  * [armel/orion5x] Build MTD_CFI_AMDSTD into the kernel again since
+    it's needed on the D-Link DNS-323 (thanks Manuel Roeder).
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Fri, 18 Dec 2009 15:34:01 +0000
+
 linux-2.6 (2.6.32-2) unstable; urgency=high
 
   [ Bastian Blank ]

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Thu Dec 17 05:29:53 2009	(r14796)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Fri Dec 18 15:34:55 2009	(r14797)
@@ -351,7 +351,7 @@
 # CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_OTP is not set
 CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set