forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm

Browse source 
Merge branch 'pxa-viper' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
	drivers/pcmcia/Kconfig
	drivers/pcmcia/Makefile
This commit is contained in:
Russell King 2008-10-07 19:08:32 +01:00 • committed by Russell King
commit cc513ac0f2
15 changed files with 2994 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/linux/smc91x.h
View file

@ -16,8 +16,19 @@
#define SMC91X_USE_DMA (1 << 6)
#define RPC_LED_100_10 (0x00) /* LED = 100Mbps OR's with 10Mbps link detect */
#define RPC_LED_RES (0x01) /* LED = Reserved */
#define RPC_LED_10 (0x02) /* LED = 10Mbps link detect */
#define RPC_LED_FD (0x03) /* LED = Full Duplex Mode */
#define RPC_LED_TX_RX (0x04) /* LED = TX or RX packet occurred */
#define RPC_LED_100 (0x05) /* LED = 100Mbps link dectect */
#define RPC_LED_TX (0x06) /* LED = TX packet occurred */
#define RPC_LED_RX (0x07) /* LED = RX packet occurred */
struct smc91x_platdata {
unsigned long flags;
unsigned char leda;
unsigned char ledb;
};
#endif /* __SMC91X_H__ */