From 0da3f76507c1b2467ee5467a9dfb9ca7b7e0a044 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 10 Mar 2006 17:46:20 +0000 Subject: [PATCH] [arm, armeb] Enable the netconsole module. svn path=/dists/trunk/linux-2.6/; revision=6114 --- debian/arch/arm/config.footbridge | 8 +++++--- debian/arch/arm/config.ixp4xx | 8 +++++--- debian/arch/arm/config.nslu2 | 8 +++++--- debian/arch/arm/config.rpc | 8 +++++--- debian/arch/arm/config.s3c2410 | 8 +++++--- debian/arch/armeb/config.nslu2 | 8 +++++--- debian/changelog | 4 ++++ 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 192ab5efa..41a725784 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -740,9 +740,11 @@ CONFIG_PPPOE=m CONFIG_SLIP=m # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index d02eae80e..7c6dbfb71 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -788,9 +788,11 @@ CONFIG_ATM_TCP=m # CONFIG_SLIP is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index 42ed1ed39..8a45b21c1 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -731,9 +731,11 @@ CONFIG_PPPOE=m # CONFIG_SLIP is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 67c6968e5..db73e305e 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -455,9 +455,11 @@ CONFIG_PPP=m CONFIG_PPPOE=m # CONFIG_SLIP is not set # CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index eca0eb1af..4197791a5 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -539,9 +539,11 @@ CONFIG_DM9000=y # CONFIG_PLIP is not set # CONFIG_SLIP is not set # CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index 3154147a3..d9d189a1c 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -731,9 +731,11 @@ CONFIG_PPPOE=m # CONFIG_SLIP is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem diff --git a/debian/changelog b/debian/changelog index b64a5ee6c..2d50b9f28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ linux-2.6 (2.6.15+2.6.16-rc5-0experimental.2) UNRELEASED; urgency=low + [ maximilian attems ] * Default to initramfs-tools on arm and armeb. + [ Martin Michlmayr ] + * [arm, armeb] Enable the netconsole module. + -- maximilian attems Fri, 10 Mar 2006 18:32:12 +0100 linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) experimental; urgency=low