From wfp5p@virginia.edu Wed Mar 25 08:05:32 2009 From: Bill Pemberton Date: Wed, 25 Mar 2009 11:05:30 -0400 Subject: Staging: comedi: Remove ULONG_PTR typedef in addi-data To: greg@kroah.com Cc: abbotti@mev.co.uk, "fmhess@users.sourceforge.netds"@schleef.org Message-ID: <20090325150530.13323.56133.stgit@viridian.itc.Virginia.EDU> Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi-data/addi_common.c | 2 +- drivers/staging/comedi/drivers/addi-data/addi_common.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) --- 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_d 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"); } --- 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