]> git.baikalelectronics.ru Git - kernel.git/commit
skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds...
authorZach Brown <zach.brown@ni.com>
Mon, 17 Oct 2016 15:49:52 +0000 (10:49 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Oct 2016 15:56:30 +0000 (11:56 -0400)
commit4b4203745af4b25b1163441ca4e6c4face00b791
treed29652973316b735da4b9e42ab47aa18ae732c8b
parent64d6e4f230e5bef6faf2007eb41dbe57e95bc50e
skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds namespace

Adding led support for phy causes namespace conflicts for some
phy drivers.

The marvel skge driver declared an enum for representing the states of
Link LED Register. The enum contained constant LED_OFF which conflicted
with declartation found in linux/leds.h.
LED_OFF changed to LED_REG_OFF
Also changed LED_ON to LED_REG_ON to avoid possible future conflict and
for consistency.

Signed-off-by: Zach Brown <zach.brown@ni.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/skge.c
drivers/net/ethernet/marvell/skge.h