Merge branch 'master' into for-davem

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ipw2x00 / ipw2100.h

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index 18741a409cf234e908e529cbd279801f00497419..9731252424900e0e5e080ced9c33d2a5ee9a82fe 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -479,6 +479,7 @@ enum {
 #define CAP_PRIVACY_ON          (1<<1) /* Off = No privacy */
 
 struct ipw2100_priv {
+       void __iomem *ioaddr;
 
        int stop_hang_check;    /* Set 1 when shutting down to kill hang_check */
        int stop_rf_kill;       /* Set 1 when shutting down to kill rf_kill */