diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 12:28:24 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 12:28:24 -0400 |
| commit | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (patch) | |
| tree | bac4953f8899d6600f4716c0bcde1e25e34c2591 /include/linux/smc91x.h | |
| parent | 8aef7e8f8de2d900da892085edbf14ea35fe6881 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/Makefile
Diffstat (limited to 'include/linux/smc91x.h')
| -rw-r--r-- | include/linux/smc91x.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h index 3827b922ba1f..bc21db598c06 100644 --- a/include/linux/smc91x.h +++ b/include/linux/smc91x.h | |||
| @@ -16,8 +16,19 @@ | |||
| 16 | 16 | ||
| 17 | #define SMC91X_USE_DMA (1 << 6) | 17 | #define SMC91X_USE_DMA (1 << 6) |
| 18 | 18 | ||
| 19 | #define RPC_LED_100_10 (0x00) /* LED = 100Mbps OR's with 10Mbps link detect */ | ||
| 20 | #define RPC_LED_RES (0x01) /* LED = Reserved */ | ||
| 21 | #define RPC_LED_10 (0x02) /* LED = 10Mbps link detect */ | ||
| 22 | #define RPC_LED_FD (0x03) /* LED = Full Duplex Mode */ | ||
| 23 | #define RPC_LED_TX_RX (0x04) /* LED = TX or RX packet occurred */ | ||
| 24 | #define RPC_LED_100 (0x05) /* LED = 100Mbps link dectect */ | ||
| 25 | #define RPC_LED_TX (0x06) /* LED = TX packet occurred */ | ||
| 26 | #define RPC_LED_RX (0x07) /* LED = RX packet occurred */ | ||
| 27 | |||
| 19 | struct smc91x_platdata { | 28 | struct smc91x_platdata { |
| 20 | unsigned long flags; | 29 | unsigned long flags; |
| 30 | unsigned char leda; | ||
| 31 | unsigned char ledb; | ||
| 21 | }; | 32 | }; |
| 22 | 33 | ||
| 23 | #endif /* __SMC91X_H__ */ | 34 | #endif /* __SMC91X_H__ */ |