diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-25 15:05:30 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 18:00:26 (GMT) |
| commit | a3435c92d0625cbba28bd12bbbf708bbf5675f3f (patch) | |
| tree | 90c8ee34705695310262dc09348f176c2f5aded2 | |
| parent | 756e9d7ca6292ba21a6a63bf35ed1abc5250b98d (diff) | |
| download | linux-a3435c92d0625cbba28bd12bbbf708bbf5675f3f.tar.xz | |
Staging: comedi: Remove ULONG_PTR typedef in addi-data
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/addi_common.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/addi_common.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 1066150..7e3193c 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -2638,7 +2638,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i devpriv->i_IobaseReserved = (int) io_addr[3]; printk("\nioremap begin"); devpriv->dw_AiBase = - (ULONG_PTR) ioremap(io_addr[3], + (unsigned long ) ioremap(io_addr[3], this_board->i_IorangeBase3); printk("\nioremap end"); } diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index a1b363d..1050a52 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -37,7 +37,6 @@ #define SUCCESS 1 /* variable type definition */ -typedef unsigned long ULONG_PTR; typedef const struct comedi_lrange *PCRANGE; @@ -356,7 +355,7 @@ typedef struct { int i_IobaseAmcc; // base+size for AMCC chip int i_IobaseAddon; //addon base address int i_IobaseReserved; - ULONG_PTR dw_AiBase; + unsigned long dw_AiBase; struct pcilst_struct *amcc; // ptr too AMCC data unsigned char allocated; // we have blocked card unsigned char b_ValidDriver; // driver is ok |