diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
| commit | a9802d43f205faa2fff422502a1336a50b9615c3 (patch) | |
| tree | 57152d6c84556320570802d01bbe04cefd8a2a7d /drivers/bcma/host_pci.c | |
| parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bcma/host_pci.c')
| -rw-r--r-- | drivers/bcma/host_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index f59244e33971..e3928d68802b 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c | |||
| @@ -154,8 +154,8 @@ const struct bcma_host_ops bcma_host_pci_ops = { | |||
| 154 | .awrite32 = bcma_host_pci_awrite32, | 154 | .awrite32 = bcma_host_pci_awrite32, |
| 155 | }; | 155 | }; |
| 156 | 156 | ||
| 157 | static int bcma_host_pci_probe(struct pci_dev *dev, | 157 | static int __devinit bcma_host_pci_probe(struct pci_dev *dev, |
| 158 | const struct pci_device_id *id) | 158 | const struct pci_device_id *id) |
| 159 | { | 159 | { |
| 160 | struct bcma_bus *bus; | 160 | struct bcma_bus *bus; |
| 161 | int err = -ENOMEM; | 161 | int err = -ENOMEM; |