diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 21:41:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 21:41:32 -0400 |
| commit | 4833c16dea61cb30d6f77dfec3067a08ba79b361 (patch) | |
| tree | fdf6cd3a851bca2c8c9db2e751abd5eddfcb2f66 /drivers/net/bfin_mac.h | |
| parent | e0e170bd7ded2ec16e2813d63c0faff43193fde8 (diff) | |
| parent | ad3e01a331435a06055cdaf19cc973dd138dc925 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: fix inverted anomaly 05000481 logic
Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
Blackfin: ppi/spi/twi headers: add missing __BFP undef
Blackfin: update defconfigs
Blackfin: bfin_twi.h: start a common TWI header
netdev: bfin_mac: push settings to platform resources
Diffstat (limited to 'drivers/net/bfin_mac.h')
| -rw-r--r-- | drivers/net/bfin_mac.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h index 04e4050df18b..aed68bed2365 100644 --- a/drivers/net/bfin_mac.h +++ b/drivers/net/bfin_mac.h | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | #include <linux/clocksource.h> | 14 | #include <linux/clocksource.h> |
| 15 | #include <linux/timecompare.h> | 15 | #include <linux/timecompare.h> |
| 16 | #include <linux/timer.h> | 16 | #include <linux/timer.h> |
| 17 | #include <linux/etherdevice.h> | ||
| 18 | #include <linux/bfin_mac.h> | ||
| 17 | 19 | ||
| 18 | #define BFIN_MAC_CSUM_OFFLOAD | 20 | #define BFIN_MAC_CSUM_OFFLOAD |
| 19 | 21 | ||