diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 18:22:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 18:22:22 -0500 |
commit | f40542532e96dda5506eb76badea322f2ae4731c (patch) | |
tree | 157b37de0c375aaebe73dc68762beb7ffe998e76 /drivers/leds | |
parent | f01eb3640308c005d31b29d0a8bc2b7acb4e3f75 (diff) | |
parent | 0fd7dc7f6c88ba4a46ff472a30d175facc8b6292 (diff) |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
IXP4xx: GTWX5715 platform only has two PCI IRQ lines, not four.
IXP4xx: Introduce IXP4XX_GPIO_IRQ(n) macro and convert IXP4xx platform files.
IXP4xx: move Gemtek GTWX5715 platform macros to the platform code.
IXP4xx: Remove unused Motorola PrPMC1100 platform macros.
IXP4xx: move FSG platform macros to the platform code.
IXP4xx: move DSM G600 platform macros to the platform code.
IXP4xx: move NAS100D platform macros to the platform code.
IXP4xx: move NSLU2 platform macros to the platform code.
IXP4xx: move Coyote platform macros to the platform code.
IXP4xx: move AVILA platform macros to the platform code.
IXP4xx: move IXDP425 platform macros to the platform code.
IXP4xx: Extend PCI MMIO indirect address space to 1 GB.
IXP4xx: Fix compilation failure with CONFIG_IXP4XX_INDIRECT_PCI.
IXP4xx: Drop "__ixp4xx_" prefix from in/out/ioread/iowrite functions for clarity.
IXP4xx: Rename indirect MMIO primitives from __ixp4xx_* to __indirect_*.
IXP4xx: Ensure index is positive in irq_to_gpio() and npe_request().
ARM: fix insl() and outsl() endianness on IXP4xx architecture.
IXP4xx: Fix normally-disabled debugging text in drivers/net/arm/ixp4xx_eth.c.
IXP4xx: change the timer base frequency to 66.666000 MHz.
Diffstat (limited to 'drivers/leds')
-rw-r--r-- | drivers/leds/leds-fsg.c | 7 |
1 files changed, 7 insertions, 0 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 | |||
25 | static short __iomem *latch_address; | 32 | static short __iomem *latch_address; |
26 | static unsigned short latch_value; | 33 | static unsigned short latch_value; |
27 | 34 | ||