aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/skge.h
diff options
context:
space:
mode:
authorZach Brown <zach.brown@ni.com>2016-10-17 10:49:52 -0500
committerDavid S. Miller <davem@davemloft.net>2016-10-18 11:56:30 -0400
commit0e0f27dd65dd7403d41d72a8efafe388bbb36f84 (patch)
treed29652973316b735da4b9e42ab47aa18ae732c8b /drivers/net/ethernet/marvell/skge.h
parentMerge branch 'netdev-adjacency' (diff)
downloadlinux-dev-0e0f27dd65dd7403d41d72a8efafe388bbb36f84.tar.xz
linux-dev-0e0f27dd65dd7403d41d72a8efafe388bbb36f84.zip
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>
Diffstat (limited to 'drivers/net/ethernet/marvell/skge.h')
-rw-r--r--drivers/net/ethernet/marvell/skge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/skge.h b/drivers/net/ethernet/marvell/skge.h
index a2eb34115844..3ea151ff9c43 100644
--- a/drivers/net/ethernet/marvell/skge.h
+++ b/drivers/net/ethernet/marvell/skge.h
@@ -662,8 +662,8 @@ enum {
LED_BLK_OFF = 1<<4, /* Link LED Blinking Off */
LED_SYNC_ON = 1<<3, /* Use Sync Wire to switch LED */
LED_SYNC_OFF = 1<<2, /* Disable Sync Wire Input */
- LED_ON = 1<<1, /* switch LED on */
- LED_OFF = 1<<0, /* switch LED off */
+ LED_REG_ON = 1<<1, /* switch LED on */
+ LED_REG_OFF = 1<<0, /* switch LED off */
};
/* Receive GMAC FIFO (YUKON) */