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/pci/pci.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/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 28af496b441e..061d1ee0046a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -2042,7 +2042,7 @@ static int __devinit pci_init(void) | |||
| 2042 | return 0; | 2042 | return 0; |
| 2043 | } | 2043 | } |
| 2044 | 2044 | ||
| 2045 | static int __devinit pci_setup(char *str) | 2045 | static int __init pci_setup(char *str) |
| 2046 | { | 2046 | { |
| 2047 | while (str) { | 2047 | while (str) { |
| 2048 | char *k = strchr(str, ','); | 2048 | char *k = strchr(str, ','); |