aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2007-12-22 16:01:36 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:16 -0500
commit993e1c780b323736a2cdc24564f35e80ce8d3337 (patch)
tree6dd8e11093bc3820351fd83bebfecc6f0ae33fa6 /include
parentf3dd3fcc2c79b950801641075b33b86acc372d9b (diff)
ssb: Fix PCMCIA lowlevel register access
This fixes lowlevel register access for PCMCIA based devices. The patch also adds a temporary workaround for the device mac address. It simply adds generation of a random address. The real SPROM extraction will follow in another patch. The temporary workaround will be removed then, but for now it's OK. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ssb/ssb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 0eaa98424f0a..cacbae531945 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -231,7 +231,8 @@ struct ssb_bus {
231 struct ssb_device *mapped_device; 231 struct ssb_device *mapped_device;
232 /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */ 232 /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
233 u8 mapped_pcmcia_seg; 233 u8 mapped_pcmcia_seg;
234 /* Lock for core and segment switching. */ 234 /* Lock for core and segment switching.
235 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
235 spinlock_t bar_lock; 236 spinlock_t bar_lock;
236 237
237 /* The bus this backplane is running on. */ 238 /* The bus this backplane is running on. */