diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:32 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:32 -0400 |
| commit | cc513ac0f29473de365664c4fba9cf033c1f2324 (patch) | |
| tree | 27ee53310699caa0e5cac80d519c0ec04120f8ca /include | |
| parent | 1543966a079fc7065849ae43ca4dd767c188ad55 (diff) | |
| parent | 19ec95df2c4ec2d28919f267c4d17178f8fe9d9c (diff) | |
Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm
Merge branch 'pxa-viper' into pxa-machines
Conflicts:
arch/arm/mach-pxa/Makefile
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'include')
| -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__ */ |