diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-07-20 11:43:13 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-07-20 11:43:13 +0000 |
| commit | bd66295fa1c58b4f0e55eb4c484c3916607c5d91 (patch) | |
| tree | a40ebf3670ac173fb13f75ef67ef3f38a8f855f8 | |
| parent | 4c475d38d99bb834b0f717d22275cf6ebf24c38d (diff) | |
Use 2.4.26 final, not a -pre
| -rw-r--r-- | make/linux.mk | 4 | ||||
| -rw-r--r-- | sources/kernel-patches/001-patch-2.4.26-pre5.bz2 | bin | 729361 -> 0 bytes | |||
| -rw-r--r-- | sources/kernel-patches/100_VERSION.bz2 | bin | 236 -> 227 bytes | |||
| -rw-r--r-- | sources/linux.config | 4 |
4 files changed, 5 insertions, 3 deletions
diff --git a/make/linux.mk b/make/linux.mk index fec8e8b46..bb8f96b19 100644 --- a/make/linux.mk +++ b/make/linux.mk @@ -22,9 +22,9 @@ ifneq ($(filter $(TARGETS),linux),) # Version of Linux to download and then apply patches to -DOWNLOAD_LINUX_VERSION=2.4.25 +DOWNLOAD_LINUX_VERSION=2.4.26 # Version of Linux AFTER patches -LINUX_VERSION=2.4.26-pre5-erik +LINUX_VERSION=2.4.26-erik LINUX_FORMAT=bzImage #LINUX_FORMAT=images/zImage.prep diff --git a/sources/kernel-patches/001-patch-2.4.26-pre5.bz2 b/sources/kernel-patches/001-patch-2.4.26-pre5.bz2 Binary files differdeleted file mode 100644 index aa934c5a7..000000000 --- a/sources/kernel-patches/001-patch-2.4.26-pre5.bz2 +++ /dev/null diff --git a/sources/kernel-patches/100_VERSION.bz2 b/sources/kernel-patches/100_VERSION.bz2 Binary files differindex 54d2e6571..9bfe01ce2 100644 --- a/sources/kernel-patches/100_VERSION.bz2 +++ b/sources/kernel-patches/100_VERSION.bz2 diff --git a/sources/linux.config b/sources/linux.config index e33656a9f..d268d7784 100644 --- a/sources/linux.config +++ b/sources/linux.config @@ -302,6 +302,7 @@ CONFIG_NET_SCH_SFQ=y CONFIG_NET_SCH_TEQL=y CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_GRED=y +CONFIG_NET_SCH_DELAY=y CONFIG_NET_SCH_DSMARK=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_QOS=y @@ -374,6 +375,7 @@ CONFIG_IDEDMA_PCI_WIP=y # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_WDC_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_ATIIXP is not set # CONFIG_AMD74XX_OVERRIDE is not set # CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set @@ -736,7 +738,7 @@ CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_RW is not set # CONFIG_ROMFS_FS is not set -# CONFIG_EXT2_FS is not set +CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UDF_FS is not set # CONFIG_UDF_RW is not set |