From 1555a1102e76ee93c435d3c722e5039558be0c41 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Nov 2008 15:31:31 -0800 Subject: [PATCH] --- yaml --- r: 126733 b: refs/heads/master c: 39eca2a087e30001b3679c04338976d3b02b9173 h: refs/heads/master i: 126731: 1346d20e8a392a3c9a3822c999b9ffb9188d5519 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/me_daq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 01b97e3de348..c8fb6f1e7e3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e08c19867cefd9d1a1f07e309338b93439d147a +refs/heads/master: 39eca2a087e30001b3679c04338976d3b02b9173 diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c index 8821d5286082..6accec20a0f9 100644 --- a/trunk/drivers/staging/comedi/drivers/me_daq.c +++ b/trunk/drivers/staging/comedi/drivers/me_daq.c @@ -234,7 +234,7 @@ static const struct me_board me_boards[] = { .ao_channel_nbr = 0, .ao_resolution = 0, .ao_resolution_mask = 0, - .ao_range_list = 0, + .ao_range_list = NULL, .ai_channel_nbr = 16, /* Analog Input */ .ai_resolution = 12, @@ -257,8 +257,8 @@ COMEDI_PCI_INITCLEANUP(me_driver, me_pci_table); /* Private data structure */ struct me_private_data { struct pci_dev *pci_device; - void *plx_regbase; /* PLX configuration base address */ - void *me_regbase; /* Base address of the Meilhaus card */ + void __iomem *plx_regbase; /* PLX configuration base address */ + void __iomem *me_regbase; /* Base address of the Meilhaus card */ unsigned long plx_regbase_size; /* Size of PLX configuration space */ unsigned long me_regbase_size; /* Size of Meilhaus space */