git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-core-next
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
hostap
/
hostap_pci.c
diff --git
a/drivers/net/wireless/hostap/hostap_pci.c
b/drivers/net/wireless/hostap/hostap_pci.c
index d24dc7dc072328fcecab649193ed4cbad0c17caa..972a9c3af39e5e7ad11dafa354b5f7314083a985 100644
(file)
--- 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,
dev->irq = pdev->irq;
hw_priv->mem_start = mem;
+ dev->base_addr = (unsigned long) mem;
prism2_pci_cor_sreset(local);