summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-03 00:21:58 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-03 00:21:58 +0000
commit9f25933453c73393505f2bf044bf44b41648259b (patch)
tree230ce535339c235a13228d7d429ada8156e8d858 /target/linux
parent4e9e90d50ff4d93f4261c3977355482a0aba3868 (diff)
update config, make 2.6.26-rc8 the default for ixp4xx
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11625 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ixp4xx/Makefile2
-rw-r--r--target/linux/ixp4xx/config-default3
2 files changed, 4 insertions, 1 deletions
diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index 46639ecfb..1e2a52ff0 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 fdc4cf68d..ea92bbff3 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