[kernel] r18661 - in dists/trunk/linux-2.6/debian: . config config/armel config/mips

[Ben Hutchings]

Author: benh
Date: Thu Feb  2 04:49:27 2012
New Revision: 18661

Log:
net: Disable FIXED_PHY

This is only useful for specific platforms that need it, and after it
became a boolean (rather than tristate) option it has been conflicting
with platform MDIO buses on platforms we actually do support.

Disable it completely and add a comment about this.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/config/armel/config.mv78xx0
   dists/trunk/linux-2.6/debian/config/armel/config.orion5x
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/defines
   dists/trunk/linux-2.6/debian/config/mips/config.octeon
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Feb  2 04:49:27 2012	(r18661)
@@ -2,6 +2,7 @@
 
   [ Ben Hutchings ]
   * [armel] Add mv78xx0 flavour; thanks to Steve McIntyre for the config
+  * net: Disable FIXED_PHY; this driver only causes trouble
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 02 Feb 2012 03:18:04 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Thu Feb  2 04:49:27 2012	(r18661)
@@ -453,8 +453,6 @@
 ##
 #. Turned off because this causes networking on some Kirkwood machines to fail
 # CONFIG_MARVELL_PHY is not set
-#. Turned off to avoid namespace collisions
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/net/wireless/mwifiex/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/armel/config.mv78xx0
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.mv78xx0	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/armel/config.mv78xx0	Thu Feb  2 04:49:27 2012	(r18661)
@@ -412,12 +412,6 @@
 # CONFIG_VIA_VELOCITY is not set
 
 ##
-## file: drivers/net/phy/Kconfig
-##
-#. Turned off to avoid namespace collisions
-# CONFIG_FIXED_PHY is not set
-
-##
 ## file: drivers/pcmcia/Kconfig
 ##
 # CONFIG_PCCARD is not set

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Thu Feb  2 04:49:27 2012	(r18661)
@@ -433,8 +433,6 @@
 ##
 #. Turned off because this causes networking on some Orion machines to fail
 # CONFIG_MARVELL_PHY is not set
-#. Turned off to avoid namespace collisions
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/pcmcia/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Feb  2 04:49:27 2012	(r18661)
@@ -2039,7 +2039,8 @@
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-CONFIG_FIXED_PHY=y
+#. Must only be enabled for specific flavours
+# CONFIG_FIXED_PHY is not set
 CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_GPIO is not set
 

Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/defines	Thu Feb  2 04:49:27 2012	(r18661)
@@ -2,6 +2,8 @@
 abiname: 1
 ignore-changes:
  module:arch/x86/kvm/*
+ fixed_phy_add
+ fixed_phy_set_link_update
 
 [base]
 arches:

Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon	Thu Feb  2 04:49:27 2012	(r18661)
@@ -95,7 +95,6 @@
 ##
 ## file: drivers/net/phy/Kconfig
 ##
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/rtc/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Thu Feb  2 04:49:27 2012	(r18661)
@@ -560,7 +560,6 @@
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_BROADCOM_PHY=y
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/net/plip/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Thu Feb  2 03:39:37 2012	(r18660)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Thu Feb  2 04:49:27 2012	(r18661)
@@ -566,7 +566,6 @@
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_BROADCOM_PHY=y
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/net/plip/Kconfig