diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:05:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:05:24 -0400 |
| commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
| tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /drivers/net/wireless/hostap/hostap_pci.c | |
| parent | 167ffc44caaee68ea60dadf6931a4d195a4ed1f0 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_pci.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index d24dc7dc0723..972a9c3af39e 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c | |||
| @@ -330,6 +330,7 @@ static int prism2_pci_probe(struct pci_dev *pdev, | |||
| 330 | 330 | ||
| 331 | dev->irq = pdev->irq; | 331 | dev->irq = pdev->irq; |
| 332 | hw_priv->mem_start = mem; | 332 | hw_priv->mem_start = mem; |
| 333 | dev->base_addr = (unsigned long) mem; | ||
| 333 | 334 | ||
| 334 | prism2_pci_cor_sreset(local); | 335 | prism2_pci_cor_sreset(local); |
| 335 | 336 | ||