diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-20 00:05:42 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-20 00:05:42 -0500 |
| commit | 1e6b39fbb61800e3ecee58dc8c4bca57c89365cd (patch) | |
| tree | 513ce034cff05371496713b8327f9dc074bdcc6d /drivers/net/wireless/prism54/isl_38xx.c | |
| parent | cdbce9c87e4ebd186389919b95e49592ec35dae6 (diff) | |
| parent | 3bedff1d73b86e0cf52634efb447e9ada08f2cc6 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/wireless/prism54/isl_38xx.c')
| -rw-r--r-- | drivers/net/wireless/prism54/isl_38xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c index 109a96d90007..23deee69974b 100644 --- a/drivers/net/wireless/prism54/isl_38xx.c +++ b/drivers/net/wireless/prism54/isl_38xx.c | |||
| @@ -164,12 +164,12 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base) | |||
| 164 | /* assert the Wakeup interrupt in the Device Interrupt Register */ | 164 | /* assert the Wakeup interrupt in the Device Interrupt Register */ |
| 165 | isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_WAKEUP, | 165 | isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_WAKEUP, |
| 166 | ISL38XX_DEV_INT_REG); | 166 | ISL38XX_DEV_INT_REG); |
| 167 | |||
| 168 | #if VERBOSE > SHOW_ERROR_MESSAGES | ||
| 167 | udelay(ISL38XX_WRITEIO_DELAY); | 169 | udelay(ISL38XX_WRITEIO_DELAY); |
| 168 | 170 | ||
| 169 | /* perform another read on the Device Status Register */ | 171 | /* perform another read on the Device Status Register */ |
| 170 | reg = readl(device_base + ISL38XX_CTRL_STAT_REG); | 172 | reg = readl(device_base + ISL38XX_CTRL_STAT_REG); |
| 171 | |||
| 172 | #if VERBOSE > SHOW_ERROR_MESSAGES | ||
| 173 | do_gettimeofday(¤t_time); | 173 | do_gettimeofday(¤t_time); |
| 174 | DEBUG(SHOW_TRACING, "%08li.%08li Device register read %08x\n", | 174 | DEBUG(SHOW_TRACING, "%08li.%08li Device register read %08x\n", |
| 175 | current_time.tv_sec, (long)current_time.tv_usec, reg); | 175 | current_time.tv_sec, (long)current_time.tv_usec, reg); |