diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /drivers/net/smc91x.h | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'drivers/net/smc91x.h')
| -rw-r--r-- | drivers/net/smc91x.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 1083e2c5dec..6c44f86ae3f 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -1140,6 +1140,16 @@ static const char * chip_ids[ 16 ] = { | |||
| 1140 | 1140 | ||
| 1141 | #define SMC_GET_MII(lp) SMC_inw(ioaddr, MII_REG(lp)) | 1141 | #define SMC_GET_MII(lp) SMC_inw(ioaddr, MII_REG(lp)) |
| 1142 | 1142 | ||
| 1143 | #define SMC_GET_GP(lp) SMC_inw(ioaddr, GP_REG(lp)) | ||
| 1144 | |||
| 1145 | #define SMC_SET_GP(lp, x) \ | ||
| 1146 | do { \ | ||
| 1147 | if (SMC_MUST_ALIGN_WRITE(lp)) \ | ||
| 1148 | SMC_outl((x)<<16, ioaddr, SMC_REG(lp, 8, 1)); \ | ||
| 1149 | else \ | ||
| 1150 | SMC_outw(x, ioaddr, GP_REG(lp)); \ | ||
| 1151 | } while (0) | ||
| 1152 | |||
| 1143 | #define SMC_SET_MII(lp, x) SMC_outw(x, ioaddr, MII_REG(lp)) | 1153 | #define SMC_SET_MII(lp, x) SMC_outw(x, ioaddr, MII_REG(lp)) |
| 1144 | 1154 | ||
| 1145 | #define SMC_GET_MIR(lp) SMC_inw(ioaddr, MIR_REG(lp)) | 1155 | #define SMC_GET_MIR(lp) SMC_inw(ioaddr, MIR_REG(lp)) |