diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /drivers/net/cs89x0.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'drivers/net/cs89x0.c')
| -rw-r--r-- | drivers/net/cs89x0.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 47eecce35f..2dcca79b1f 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -1905,8 +1905,7 @@ MODULE_LICENSE("GPL"); | |||
| 1905 | 1905 | ||
| 1906 | */ | 1906 | */ |
| 1907 | 1907 | ||
| 1908 | int | 1908 | int __init init_module(void) |
| 1909 | init_module(void) | ||
| 1910 | { | 1909 | { |
| 1911 | struct net_device *dev = alloc_etherdev(sizeof(struct net_local)); | 1910 | struct net_device *dev = alloc_etherdev(sizeof(struct net_local)); |
| 1912 | struct net_local *lp; | 1911 | struct net_local *lp; |