diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:42 -0500 |
| commit | 16bc67edeb49b531940b2ba6c183780a1b5c472d (patch) | |
| tree | 71b4bc48e47e54f2c0b3126d8f81d2f31b707ea8 /drivers/net/sh_eth.c | |
| parent | f6630114d9198aa959ac95c131334c020038f253 (diff) | |
| parent | 047106adcc85e3023da210143a6ab8a55df9e0fc (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Pick up fixes that did not make it into .32.0
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/sh_eth.c')
| -rw-r--r-- | drivers/net/sh_eth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index f49d0800c1d1..528b912a4b0d 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/phy.h> | 30 | #include <linux/phy.h> |
| 31 | #include <linux/cache.h> | 31 | #include <linux/cache.h> |
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | #include <asm/cacheflush.h> | ||
| 33 | 34 | ||
| 34 | #include "sh_eth.h" | 35 | #include "sh_eth.h" |
| 35 | 36 | ||