diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/net/wan | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/sbni.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index db2c798ba89e..175ba13bce41 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
| @@ -1495,8 +1495,7 @@ module_param(skip_pci_probe, bool, 0); | |||
| 1495 | MODULE_LICENSE("GPL"); | 1495 | MODULE_LICENSE("GPL"); |
| 1496 | 1496 | ||
| 1497 | 1497 | ||
| 1498 | int | 1498 | int __init init_module( void ) |
| 1499 | init_module( void ) | ||
| 1500 | { | 1499 | { |
| 1501 | struct net_device *dev; | 1500 | struct net_device *dev; |
| 1502 | int err; | 1501 | int err; |