diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /drivers/net/wireless/hostap/hostap_pci.c | |
| parent | 73b2c7165b76b20eb1290e7efebc33cfd21db1ca (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' into for-next
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 | ||