diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:28:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:28:04 -0400 |
| commit | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (patch) | |
| tree | b12a1c359ad53ae10601f77b3438bb27c3c8f337 /drivers/net/mac89x0.c | |
| parent | 1ac97018169c5a13feaa90d9671f2d6ba2d9e86e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/kconfig
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); |