From 16714d07ecb4432a899fa81c4cdc338e8336e7b3 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 25 Jan 2012 07:58:22 +0000 Subject: [PATCH] * [mips,octeon] Disabled CONFIG_FIXED_PHY as it conflicts with the octeon phy driver. svn path=/dists/trunk/linux-2.6/; revision=18632 --- debian/changelog | 4 ++++ debian/config/mips/config.octeon | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index d3366ac8c..4be136e57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ linux-2.6 (3.2.1-3) UNRELEASED; urgency=low * 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 Tue, 24 Jan 2012 06:19:55 +0000 linux-2.6 (3.2.1-2) unstable; urgency=high diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon index 0c6d89f33..c4a9520d4 100644 --- a/debian/config/mips/config.octeon +++ b/debian/config/mips/config.octeon @@ -92,6 +92,11 @@ CONFIG_MTD_PHYSMAP=y ## CONFIG_OCTEON_MGMT_ETHERNET=y +## +## file: drivers/net/phy/Kconfig +## +# CONFIG_FIXED_PHY is not set + ## ## file: drivers/rtc/Kconfig ##