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/apne.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/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 | ||