diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /drivers/net/sun3lance.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
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: |