From f8584572d009f33129ff7b770e74884c5e0640f8 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 10 Jan 2006 23:11:01 +0000 Subject: [PATCH] [arm] Activate the right network drivers on Footbridge (Tulip and NE2K). svn path=/dists/trunk/linux-2.6/; revision=5396 --- debian/arch/arm/config.footbridge | 12 +++++++++--- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 681d6b471..a2f252776 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -602,8 +602,6 @@ CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y # CONFIG_EL1 is not set # CONFIG_EL2 is not set # CONFIG_ELPLUS is not set @@ -638,7 +636,6 @@ CONFIG_NET_PCI=y # CONFIG_E100 is not set # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set -CONFIG_NE2K_PCI=y # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_SIS900 is not set @@ -1753,3 +1750,12 @@ CONFIG_VIDEO_BUF=m CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_EQUALIZER is not set +# CONFIG_NET_VENDOR_3COM is not set +CONFIG_NET_TULIP=y +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_NE2K_PCI=m +# CONFIG_CASSINI is not set diff --git a/debian/changelog b/debian/changelog index 84c142f47..590415591 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ linux-2.6 (2.6.15-3) UNRELEASED; urgency=low * [arm] Activate IDEPCI on footbridge so SL82C105 will really be compiled in. * [arm] Activate tmpfs. + * [arm] Activate the right network drivers on Footbridge (Tulip and + NE2K). -- Martin Michlmayr Tue, 10 Jan 2006 22:59:19 +0000