aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/leds/leds-fsg.c7
-rw-r--r--drivers/net/arm/ixp4xx_eth.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
index 5f7c9c5c09b1..d11d05be0dee 100644
--- a/drivers/leds/leds-fsg.c
+++ b/drivers/leds/leds-fsg.c
@@ -22,6 +22,13 @@
22#include <mach/hardware.h> 22#include <mach/hardware.h>
23#include <asm/io.h> 23#include <asm/io.h>
24 24
25#define FSG_LED_WLAN_BIT 0
26#define FSG_LED_WAN_BIT 1
27#define FSG_LED_SATA_BIT 2
28#define FSG_LED_USB_BIT 4
29#define FSG_LED_RING_BIT 5
30#define FSG_LED_SYNC_BIT 7
31
25static short __iomem *latch_address; 32static short __iomem *latch_address;
26static unsigned short latch_value; 33static unsigned short latch_value;
27 34
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 691b81eb0f46..c3dfbdd2cdcf 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -322,7 +322,7 @@ static int ixp4xx_mdio_write(struct mii_bus *bus, int phy_id, int location,
322 ret = ixp4xx_mdio_cmd(bus, phy_id, location, 1, val); 322 ret = ixp4xx_mdio_cmd(bus, phy_id, location, 1, val);
323 spin_unlock_irqrestore(&mdio_lock, flags); 323 spin_unlock_irqrestore(&mdio_lock, flags);
324#if DEBUG_MDIO 324#if DEBUG_MDIO
325 printk(KERN_DEBUG "%s #%i: MII read [%i] <- 0x%X, err = %i\n", 325 printk(KERN_DEBUG "%s #%i: MII write [%i] <- 0x%X, err = %i\n",
326 bus->name, phy_id, location, val, ret); 326 bus->name, phy_id, location, val, ret);
327#endif 327#endif
328 return ret; 328 return ret;