diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/net/usb/smsc95xx.h | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/usb/smsc95xx.h')
| -rw-r--r-- | drivers/net/usb/smsc95xx.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h index 66b5c84f302e..86bc44977fbd 100644 --- a/drivers/net/usb/smsc95xx.h +++ b/drivers/net/usb/smsc95xx.h | |||
| @@ -99,6 +99,9 @@ | |||
| 99 | #define PM_CTL_WUPS_MULTI_ (0x00000003) | 99 | #define PM_CTL_WUPS_MULTI_ (0x00000003) |
| 100 | 100 | ||
| 101 | #define LED_GPIO_CFG (0x24) | 101 | #define LED_GPIO_CFG (0x24) |
| 102 | #define LED_GPIO_CFG_SPD_LED (0x01000000) | ||
| 103 | #define LED_GPIO_CFG_LNK_LED (0x00100000) | ||
| 104 | #define LED_GPIO_CFG_FDX_LED (0x00010000) | ||
| 102 | 105 | ||
| 103 | #define GPIO_CFG (0x28) | 106 | #define GPIO_CFG (0x28) |
| 104 | 107 | ||