diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/net/fec.c | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index a515acccc61f..682e7f0b5581 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -1240,6 +1240,7 @@ static void __inline__ fec_phy_ack_intr(void) | |||
| 1240 | icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); | 1240 | icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); |
| 1241 | *icrp = 0x0d000000; | 1241 | *icrp = 0x0d000000; |
| 1242 | } | 1242 | } |
| 1243 | #endif | ||
| 1243 | 1244 | ||
| 1244 | #ifdef CONFIG_M5272 | 1245 | #ifdef CONFIG_M5272 |
| 1245 | static void __inline__ fec_get_mac(struct net_device *dev) | 1246 | static void __inline__ fec_get_mac(struct net_device *dev) |