diff --git a/debian/changelog b/debian/changelog
index 33774f69b..723deddcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux-2.6 (3.2.2-2) UNRELEASED; urgency=low
 
   [ 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@decadent.org.uk>  Thu, 02 Feb 2012 03:18:04 +0000
 
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 62f431769..6246aedff 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -453,8 +453,6 @@ CONFIG_MV643XX_ETH=m
 ##
 #. 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
diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0
index 8a6bf4814..e0ef3b122 100644
--- a/debian/config/armel/config.mv78xx0
+++ b/debian/config/armel/config.mv78xx0
@@ -411,12 +411,6 @@ CONFIG_MV643XX_ETH=m
 ##
 # 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
 ##
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index a0e1c0036..46e3e5055 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -433,8 +433,6 @@ CONFIG_MV643XX_ETH=m
 ##
 #. 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
diff --git a/debian/config/config b/debian/config/config
index eec6fcd8b..f32336583 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2039,7 +2039,8 @@ CONFIG_NATIONAL_PHY=m
 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
 
diff --git a/debian/config/defines b/debian/config/defines
index 844817626..e31014789 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -2,6 +2,8 @@
 abiname: 1
 ignore-changes:
  module:arch/x86/kvm/*
+ fixed_phy_add
+ fixed_phy_set_link_update
 
 [base]
 arches:
diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon
index c4a9520d4..fded6aa24 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@@ -95,7 +95,6 @@ CONFIG_OCTEON_MGMT_ETHERNET=y
 ##
 ## file: drivers/net/phy/Kconfig
 ##
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/rtc/Kconfig
diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a
index 524d51583..88a851708 100644
--- a/debian/config/mips/config.sb1-bcm91250a
+++ b/debian/config/mips/config.sb1-bcm91250a
@@ -560,7 +560,6 @@ CONFIG_VIA_RHINE=m
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_BROADCOM_PHY=y
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/net/plip/Kconfig
diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b
index f279005f4..a0dff62ff 100644
--- a/debian/config/mips/config.sb1a-bcm91480b
+++ b/debian/config/mips/config.sb1a-bcm91480b
@@ -566,7 +566,6 @@ CONFIG_VIA_RHINE=m
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_BROADCOM_PHY=y
-# CONFIG_FIXED_PHY is not set
 
 ##
 ## file: drivers/net/plip/Kconfig