diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/net/ethernet/smsc/smc91x.h | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/net/ethernet/smsc/smc91x.h')
| -rw-r--r-- | drivers/net/ethernet/smsc/smc91x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index 370e13dde115..5730fe2445a6 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h | |||
| @@ -271,7 +271,7 @@ static inline void mcf_outsw(void *a, unsigned char *p, int l) | |||
| 271 | #define SMC_insw(a, r, p, l) mcf_insw(a + r, p, l) | 271 | #define SMC_insw(a, r, p, l) mcf_insw(a + r, p, l) |
| 272 | #define SMC_outsw(a, r, p, l) mcf_outsw(a + r, p, l) | 272 | #define SMC_outsw(a, r, p, l) mcf_outsw(a + r, p, l) |
| 273 | 273 | ||
| 274 | #define SMC_IRQ_FLAGS (IRQF_DISABLED) | 274 | #define SMC_IRQ_FLAGS 0 |
| 275 | 275 | ||
| 276 | #else | 276 | #else |
| 277 | 277 | ||