[armel/orion5x, armel/kirkwood] Disable MARVELL_PHY since it may
lead to conflicts with the build-in Ethernet. svn path=/dists/trunk/linux-2.6/; revision=14178
This commit is contained in:
parent
16da5e8b5f
commit
bcedb02859
|
@ -68,6 +68,8 @@ linux-2.6 (2.6.31~rc7-1~experimental.1) UNRELEASED; urgency=low
|
|||
[ Martin Michlmayr ]
|
||||
* [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these
|
||||
platforms have been converted to GPIOLIB.
|
||||
* [armel/orion5x, armel/kirkwood] Disable MARVELL_PHY since it may
|
||||
lead to conflicts with the build-in Ethernet.
|
||||
|
||||
[ Bastian Blank ]
|
||||
* Disable staging drivers by default.
|
||||
|
|
|
@ -619,3 +619,5 @@ CONFIG_X25=m
|
|||
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
|
||||
# CONFIG_MARVELL_PHY is not set
|
||||
|
||||
|
|
|
@ -626,3 +626,5 @@ CONFIG_X25=m
|
|||
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
|
||||
# CONFIG_MARVELL_PHY is not set
|
||||
|
||||
|
|
Loading…
Reference in New Issue