From 07505e384eb9c5c66496d91c2deec3ecfcf228fb Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Sat, 12 Jul 2014 20:26:27 +0000 Subject: [PATCH] [armel] Remove drivers/net/phy configs which are redundant with toplevel No change to the eventual .config files svn path=/dists/sid/linux/; revision=21539 --- debian/changelog | 7 +++++++ debian/config/armel/config.ixp4xx | 10 ---------- debian/config/armel/config.kirkwood | 5 ----- debian/config/armel/config.orion5x | 5 ----- debian/config/armel/config.versatile | 15 --------------- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c1caa0d6..5c54ef17f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (3.14.12-2) UNRELEASED; urgency=medium + + [ Ian Campbell ] + * [armel] Remove drivers/net/phy configs which are redundant with toplevel. + + -- Ian Campbell Sat, 12 Jul 2014 21:12:17 +0100 + linux (3.14.12-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 4788af314..26d2aeaef 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -462,16 +462,6 @@ CONFIG_IXP4XX_ETH=m ## # CONFIG_HIPPI is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_PHYLIB=m -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 0e0f6c41c..83f403f4b 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -454,11 +454,6 @@ CONFIG_MVMDIO=m ## # CONFIG_VIA_VELOCITY is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_MARVELL_PHY=m - ## ## file: drivers/net/wireless/mwifiex/Kconfig ## diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 97d16dd49..486b86151 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -408,11 +408,6 @@ CONFIG_MVMDIO=m ## # CONFIG_VIA_VELOCITY is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_MARVELL_PHY=m - ## ## file: drivers/pcmcia/Kconfig ## diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index d1fe41ec7..4f99d939c 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -306,21 +306,6 @@ CONFIG_VIA_RHINE=m ## # CONFIG_HIPPI is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_PHYLIB=m -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_ICPLUS_PHY=m -# CONFIG_MDIO_BITBANG is not set - ## ## file: drivers/pci/Kconfig ##