diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /drivers/net/mac89x0.c | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/mac89x0.c')
| -rw-r--r-- | drivers/net/mac89x0.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index 2a66e5b7cebc..4ce8afd481c3 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c | |||
| @@ -183,6 +183,9 @@ struct net_device * __init mac89x0_probe(int unit) | |||
| 183 | int err = -ENODEV; | 183 | int err = -ENODEV; |
| 184 | DECLARE_MAC_BUF(mac); | 184 | DECLARE_MAC_BUF(mac); |
| 185 | 185 | ||
| 186 | if (!MACH_IS_MAC) | ||
| 187 | return ERR_PTR(-ENODEV); | ||
| 188 | |||
| 186 | dev = alloc_etherdev(sizeof(struct net_local)); | 189 | dev = alloc_etherdev(sizeof(struct net_local)); |
| 187 | if (!dev) | 190 | if (!dev) |
| 188 | return ERR_PTR(-ENOMEM); | 191 | return ERR_PTR(-ENOMEM); |