From 661fcf12ff0b2a3e95127e94cf148ba97e19506b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 May 2010 16:05:52 -0700 Subject: [PATCH] --- yaml --- r: 197243 b: refs/heads/master c: b74a9670857c2af74e36ecbd31bbc55ddd8e1311 h: refs/heads/master i: 197241: eccb4890e216be63e56e87ebe38e872298ebadf5 197239: 6fa91f8f9ca112dc5029fe8101699cedaeab32d5 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/plx9080.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 66be3529c72d..9fc2a4590c4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3752a1dfd8a003139dee2c80de3d915534e2b39 +refs/heads/master: b74a9670857c2af74e36ecbd31bbc55ddd8e1311 diff --git a/trunk/drivers/staging/comedi/drivers/plx9080.h b/trunk/drivers/staging/comedi/drivers/plx9080.h index 53bcdb7b5c5a..485d63f99293 100644 --- a/trunk/drivers/staging/comedi/drivers/plx9080.h +++ b/trunk/drivers/staging/comedi/drivers/plx9080.h @@ -380,9 +380,9 @@ enum bigend_bits { #define MBX_ADDR_SPACE_360 0x80 /* wanXL100s/200/400 */ #define MBX_ADDR_MASK_360 (MBX_ADDR_SPACE_360-1) -static inline int plx9080_abort_dma(void *iobase, unsigned int channel) +static inline int plx9080_abort_dma(void __iomem *iobase, unsigned int channel) { - void *dma_cs_addr; + void __iomem *dma_cs_addr; uint8_t dma_status; const int timeout = 10000; unsigned int i;