diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/smc911x.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/smc911x.h')
| -rw-r--r-- | drivers/net/smc911x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 05adb6a666cf..3269292efecc 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h | |||
| @@ -42,12 +42,12 @@ | |||
| 42 | #define SMC_USE_16BIT 0 | 42 | #define SMC_USE_16BIT 0 |
| 43 | #define SMC_USE_32BIT 1 | 43 | #define SMC_USE_32BIT 1 |
| 44 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW | 44 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW |
| 45 | #elif defined(CONFIG_ARCH_OMAP34XX) | 45 | #elif defined(CONFIG_ARCH_OMAP3) |
| 46 | #define SMC_USE_16BIT 0 | 46 | #define SMC_USE_16BIT 0 |
| 47 | #define SMC_USE_32BIT 1 | 47 | #define SMC_USE_32BIT 1 |
| 48 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW | 48 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW |
| 49 | #define SMC_MEM_RESERVED 1 | 49 | #define SMC_MEM_RESERVED 1 |
| 50 | #elif defined(CONFIG_ARCH_OMAP24XX) | 50 | #elif defined(CONFIG_ARCH_OMAP2) |
| 51 | #define SMC_USE_16BIT 0 | 51 | #define SMC_USE_16BIT 0 |
| 52 | #define SMC_USE_32BIT 1 | 52 | #define SMC_USE_32BIT 1 |
| 53 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW | 53 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW |