From: Imre Kaloz <kaloz@openwrt.org>
Date: Thu, 3 Jul 2008 00:21:58 +0000 (+0000)
Subject: update config, make 2.6.26-rc8 the default for ixp4xx
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=44a4ddcab36df8b30ece3da0a6bacd3db7d234b8;p=openwrt%2Fstaging%2Fflorian.git

update config, make 2.6.26-rc8 the default for ixp4xx

SVN-Revision: 11625
---

diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index 46639ecfb4..1e2a52ff07 100644
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx
 FEATURES:=squashfs
 SUBTARGETS=generic harddisk
 
-LINUX_VERSION:=2.6.25.9
+LINUX_VERSION:=2.6.26-rc8
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index fdc4cf68d7..ea92bbff32 100644
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -52,6 +52,7 @@ CONFIG_ARM=y
 CONFIG_ATA=m
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_PIIX is not set
+CONFIG_ATA_SFF=y
 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 # CONFIG_B44 is not set
@@ -335,6 +336,7 @@ CONFIG_PATA_IXP4XX_CF=m
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
@@ -389,6 +391,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
 # CONFIG_SATA_PROMISE is not set
 # CONFIG_SATA_QSTOR is not set
 # CONFIG_SATA_SIL is not set