From 689ff45d6400640339ae83d92c3d0c042adc6991 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 18 Dec 2009 15:34:55 +0000 Subject: [PATCH] Build MTD_CFI_AMDSTD into the kernel again since it's needed on the D-Link DNS-323 (thanks Manuel Roeder). svn path=/dists/trunk/linux-2.6/; revision=14797 --- debian/changelog | 8 ++++++++ debian/config/armel/config.orion5x | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1d58276d7..7e6168eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 18 Dec 2009 15:34:01 +0000 + linux-2.6 (2.6.32-2) unstable; urgency=high [ Bastian Blank ] diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index e05e3f115..a13c6e33d 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -351,7 +351,7 @@ CONFIG_MTD_CFI_I4=y # 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