diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-05-19 09:23:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-19 09:23:07 +0200 |
commit | a8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c (patch) | |
tree | fa3c8e81ffa64798e85425cf139fdd6ba3fd7963 /drivers/net/apne.c | |
parent | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (diff) | |
parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) |
Merge branch 'linus' into x86/pattip-x86-pat-2008-05-19-07-23-07
Diffstat (limited to 'drivers/net/apne.c')
-rw-r--r-- | drivers/net/apne.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/apne.c b/drivers/net/apne.c index 47a8275d3962..867f6fff543c 100644 --- a/drivers/net/apne.c +++ b/drivers/net/apne.c @@ -127,6 +127,9 @@ struct net_device * __init apne_probe(int unit) #endif int err; + if (!MACH_IS_AMIGA) + return ERR_PTR(-ENODEV); + if (apne_owned) return ERR_PTR(-ENODEV); |