summaryrefslogtreecommitdiff
path: root/packages/linux/ixp4xx-kernel
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2007-02-21 16:17:09 +0000
committerMike Westerhof <mwester@dls.net>2007-02-21 16:17:09 +0000
commit56f3fe19b2c925649a1930ce50a7aa5dae1c67f8 (patch)
tree3179ac56f31c553a2523a7acad565b53ffbbdcb9 /packages/linux/ixp4xx-kernel
parent9a09d81ff35a44bbcd03afd5206143b59c8cc290 (diff)
slugos: demoted netconsole driver to module in rootfs, removed dsmg600 cmdline
patch (replaced by shim), added linux-2.6.20.1 patch, to bring in sync with svn
Diffstat (limited to 'packages/linux/ixp4xx-kernel')
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.20/defconfig2
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.20/series4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig
index d9a1bbc22f..6322bd14a0 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig
@@ -965,7 +965,7 @@ CONFIG_PPPOE=m
CONFIG_SLHC=m
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=y
+CONFIG_NETCONSOLE=m
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_RX is not set
# CONFIG_NETPOLL_TRAP is not set
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series
index 7100d2f806..ddbc2da1a3 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -9,7 +9,8 @@ squashfs/squashfs-force-O2.patch
squashfs/squashfs-lzma.patch
squashfs/squashfs-Kconfig.patch
squashfs/squashfs-Makefile.patch
-00-fix-redboot-bad-code.patch
+00-linux-2.6.20.1.patch
+01-fix-redboot-bad-code.patch
07-remove-avila-ixdp425-setup.patch
08-avila-loft-setup.patch
09-avila-setup-pata.patch
@@ -35,7 +36,6 @@ squashfs/squashfs-Makefile.patch
85-nslu2-rtc-fixup.patch
86-nas100d-rtc-fixup.patch
87-dsmg600-rtc-fixup.patch
-88-dsmg600-dflt-cmdline.patch
96-fsg3-support.patch
98-sata_via-pata-support-upstream.patch
99-avila-mtd-microcode.patch