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/apne.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
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) | |||
| 127 | #endif | 127 | #endif |
| 128 | int err; | 128 | int err; |
| 129 | 129 | ||
| 130 | if (!MACH_IS_AMIGA) | ||
| 131 | return ERR_PTR(-ENODEV); | ||
| 132 | |||
| 130 | if (apne_owned) | 133 | if (apne_owned) |
| 131 | return ERR_PTR(-ENODEV); | 134 | return ERR_PTR(-ENODEV); |
| 132 | 135 | ||