diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-02 22:50:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-02 22:50:27 -0500 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /drivers/rapidio/rio.c | |
| parent | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (diff) | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'drivers/rapidio/rio.c')
| -rw-r--r-- | drivers/rapidio/rio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index 680661abbc4b..6395c780008b 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c | |||
| @@ -467,7 +467,7 @@ static int __devinit rio_init(void) | |||
| 467 | 467 | ||
| 468 | device_initcall(rio_init); | 468 | device_initcall(rio_init); |
| 469 | 469 | ||
| 470 | int rio_init_mports(void) | 470 | int __devinit rio_init_mports(void) |
| 471 | { | 471 | { |
| 472 | int rc = 0; | 472 | int rc = 0; |
| 473 | struct rio_mport *port; | 473 | struct rio_mport *port; |