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

[Aurelien Jarno]

Author: aurel32
Date: Wed Jan 25 07:58:22 2012
New Revision: 18632

Log:
* [mips,octeon] Disabled CONFIG_FIXED_PHY as it conflicts with the octeon
    phy driver.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.octeon

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Jan 25 04:24:04 2012	(r18631)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jan 25 07:58:22 2012	(r18632)
@@ -15,6 +15,10 @@
   * Pass the cflags define as CFLAGS_KERNEL and CFLAGS_MODULE to kbuild
   * [m68k] Use cflags -ffreestanding (Closes: #648996)
 
+  [ Aurelien Jarno ]
+  * [mips,octeon] Disabled CONFIG_FIXED_PHY as it conflicts with the octeon
+    phy driver.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 24 Jan 2012 06:19:55 +0000
 
 linux-2.6 (3.2.1-2) unstable; urgency=high

Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon	Wed Jan 25 04:24:04 2012	(r18631)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon	Wed Jan 25 07:58:22 2012	(r18632)
@@ -93,6 +93,11 @@
 CONFIG_OCTEON_MGMT_ETHERNET=y
 
 ##
+## file: drivers/net/phy/Kconfig
+##
+# CONFIG_FIXED_PHY is not set
+
+##
 ## file: drivers/rtc/Kconfig
 ##
 CONFIG_RTC_DRV_DS1307=y