diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
| commit | 9aa9eb41942b918f385ccabd2efdd6e7e4232165 (patch) | |
| tree | 20bec7da036d31ec185dfc1dcc00753c7ac9b170 /drivers/net | |
| parent | 87075e049581f880f01eb0b41aa6ac807b299e35 (diff) | |
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/acenic.c | 2 | ||||
| -rw-r--r-- | drivers/net/gmac.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 29d5d7638..ae023616a 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -607,6 +607,7 @@ MODULE_PARM(max_tx_desc, "1-" __MODULE_STRING(8) "i"); MODULE_PARM(rx_coal_tick, "1-" __MODULE_STRING(8) "i"); MODULE_PARM(max_rx_desc, "1-" __MODULE_STRING(8) "i"); +#endif void __exit ace_module_cleanup(void) { @@ -695,7 +696,6 @@ void __exit ace_module_cleanup(void) root_dev = next; } } -#endif int __init ace_module_init(void) diff --git a/drivers/net/gmac.c b/drivers/net/gmac.c index 4717a652c..17d328294 100644 --- a/drivers/net/gmac.c +++ b/drivers/net/gmac.c @@ -9,8 +9,6 @@ */ #include <linux/module.h> - -#include <linux/config.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/types.h> |