From 6fa91f8f9ca112dc5029fe8101699cedaeab32d5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 May 2010 16:02:39 -0700 Subject: [PATCH] --- yaml --- r: 197239 b: refs/heads/master c: 6dd22814640bf04d2007489d8c1d1e0d24a09128 h: refs/heads/master i: 197237: 44dcd7838eda6086866963b69238302263e5b14b 197235: 76b02373436b10d32232dd962da0c8834d903771 197231: dfb8e256304ad39428c8a81748b3c4427022463c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ce0ab531c17..aa7aeda6e9a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 643a5420f1df521e08efae7b15d377314b88cb70 +refs/heads/master: 6dd22814640bf04d2007489d8c1d1e0d24a09128 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h index caeb6fd2d9b1..1a2816920fff 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -351,7 +351,7 @@ struct addi_private { int i_IobaseAmcc; /* base+size for AMCC chip */ int i_IobaseAddon; /* addon base address */ int i_IobaseReserved; - unsigned long dw_AiBase; + void __iomem *dw_AiBase; struct pcilst_struct *amcc; /* ptr too AMCC data */ unsigned char allocated; /* we have blocked card */ unsigned char b_ValidDriver; /* driver is ok */