diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/Space.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 9bb405bd664e..068c3563e00f 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c | |||
| @@ -55,8 +55,6 @@ extern struct net_device *eth16i_probe(int unit); | |||
| 55 | extern struct net_device *i82596_probe(int unit); | 55 | extern struct net_device *i82596_probe(int unit); |
| 56 | extern struct net_device *ewrk3_probe(int unit); | 56 | extern struct net_device *ewrk3_probe(int unit); |
| 57 | extern struct net_device *el1_probe(int unit); | 57 | extern struct net_device *el1_probe(int unit); |
| 58 | extern struct net_device *wavelan_probe(int unit); | ||
| 59 | extern struct net_device *arlan_probe(int unit); | ||
| 60 | extern struct net_device *el16_probe(int unit); | 58 | extern struct net_device *el16_probe(int unit); |
| 61 | extern struct net_device *elmc_probe(int unit); | 59 | extern struct net_device *elmc_probe(int unit); |
| 62 | extern struct net_device *elplus_probe(int unit); | 60 | extern struct net_device *elplus_probe(int unit); |
| @@ -68,7 +66,6 @@ extern struct net_device *ni5010_probe(int unit); | |||
| 68 | extern struct net_device *ni52_probe(int unit); | 66 | extern struct net_device *ni52_probe(int unit); |
| 69 | extern struct net_device *ni65_probe(int unit); | 67 | extern struct net_device *ni65_probe(int unit); |
| 70 | extern struct net_device *sonic_probe(int unit); | 68 | extern struct net_device *sonic_probe(int unit); |
| 71 | extern struct net_device *SK_init(int unit); | ||
| 72 | extern struct net_device *seeq8005_probe(int unit); | 69 | extern struct net_device *seeq8005_probe(int unit); |
| 73 | extern struct net_device *smc_init(int unit); | 70 | extern struct net_device *smc_init(int unit); |
| 74 | extern struct net_device *atarilance_probe(int unit); | 71 | extern struct net_device *atarilance_probe(int unit); |
| @@ -76,8 +73,6 @@ extern struct net_device *sun3lance_probe(int unit); | |||
| 76 | extern struct net_device *sun3_82586_probe(int unit); | 73 | extern struct net_device *sun3_82586_probe(int unit); |
| 77 | extern struct net_device *apne_probe(int unit); | 74 | extern struct net_device *apne_probe(int unit); |
| 78 | extern struct net_device *cs89x0_probe(int unit); | 75 | extern struct net_device *cs89x0_probe(int unit); |
| 79 | extern struct net_device *hplance_probe(int unit); | ||
| 80 | extern struct net_device *bagetlance_probe(int unit); | ||
| 81 | extern struct net_device *mvme147lance_probe(int unit); | 76 | extern struct net_device *mvme147lance_probe(int unit); |
| 82 | extern struct net_device *tc515_probe(int unit); | 77 | extern struct net_device *tc515_probe(int unit); |
| 83 | extern struct net_device *lance_probe(int unit); | 78 | extern struct net_device *lance_probe(int unit); |