diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /drivers/net/arm | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'drivers/net/arm')
| -rw-r--r-- | drivers/net/arm/etherh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index 00081d2b9cd5..e9d15eccad08 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c | |||
| @@ -647,7 +647,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
| 647 | struct ei_device *ei_local; | 647 | struct ei_device *ei_local; |
| 648 | struct net_device *dev; | 648 | struct net_device *dev; |
| 649 | struct etherh_priv *eh; | 649 | struct etherh_priv *eh; |
| 650 | int i, ret; | 650 | int ret; |
| 651 | DECLARE_MAC_BUF(mac); | 651 | DECLARE_MAC_BUF(mac); |
| 652 | 652 | ||
| 653 | etherh_banner(); | 653 | etherh_banner(); |