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>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 1066150eb796b615c5283aa65bfed0e175f29fa2..7e3193ce446efa3440c5385ae332c5281a920a8f 100644 (file)
--- 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 a1b363d56f389ac576de9c128cccc10538fd8553..1050a5208c447446910f1095438045ca27d49540 100644 (file)
--- 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