* [mips,octeon] Disabled CONFIG_FIXED_PHY as it conflicts with the octeon

phy driver.


svn path=/dists/trunk/linux-2.6/; revision=18632
This commit is contained in:
Aurelien Jarno 2012-01-25 07:58:22 +00:00
parent 746b4c4442
commit 16714d07ec
2 changed files with 9 additions and 0 deletions

4
debian/changelog vendored
View File

@ -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 <ben@decadent.org.uk> Tue, 24 Jan 2012 06:19:55 +0000
linux-2.6 (3.2.1-2) unstable; urgency=high

View File

@ -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
##