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/sun3lance.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/sun3lance.c')
| -rw-r--r-- | drivers/net/sun3lance.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index f8d46134daca..359452a06c67 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
| @@ -250,6 +250,9 @@ struct net_device * __init sun3lance_probe(int unit) | |||
| 250 | static int found; | 250 | static int found; |
| 251 | int err = -ENODEV; | 251 | int err = -ENODEV; |
| 252 | 252 | ||
| 253 | if (!MACH_IS_SUN3 && !MACH_IS_SUN3X) | ||
| 254 | return ERR_PTR(-ENODEV); | ||
| 255 | |||
| 253 | /* check that this machine has an onboard lance */ | 256 | /* check that this machine has an onboard lance */ |
| 254 | switch(idprom->id_machtype) { | 257 | switch(idprom->id_machtype) { |
| 255 | case SM_SUN3|SM_3_50: | 258 | case SM_SUN3|SM_3_50: |