From e58d2da185dac006fcba6f06b58d6af657fe3b7a Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 22 Mar 2013 09:42:18 -0700
Subject: [PATCH] --- yaml --- r: 363711 b: refs/heads/master c:
 4d3cc8ab551af2452705cbccd0165dcdf1862196 h: refs/heads/master i:   363709:
 5967ccbda3ae028c95af73336d06935e494e042e   363707:
 aef053bfd3dd5bd303de928ca35755047984690a   363703:
 f9681125bb4395f24ea10181ef8875c52cfcd8cb   363695:
 acb1283c607e53d537ad45ed756b4f91c8f57657   363679:
 54666737cb735f6d5e92e2f8a1dee0b4bc81aaa2   363647:
 ebd7047863765109b7ddc20aba27685a210e09f8 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/comedi/drivers/ni_labpc.c | 8 ++++----
 trunk/drivers/staging/comedi/drivers/ni_labpc.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 900e42cef38e..f7972c34d2ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0baa0c11701ae0f813cbdf32cbe54e90f8f4958
+refs/heads/master: 4d3cc8ab551af2452705cbccd0165dcdf1862196
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.c b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
index 43cf49141e5f..240db9e23f73 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
@@ -350,7 +350,7 @@ static const struct labpc_boardinfo labpc_boards[] = {
 		.ai_range_code		= labpc_1200_ai_gain_bits,
 		.ai_range_is_unipolar	= labpc_1200_is_unipolar,
 		.ai_scan_up		= 1,
-		.memory_mapped_io	= 1,
+		.has_mmio		= 1,
 	},
 #endif
 };
@@ -843,7 +843,7 @@ static inline int labpc_counter_load(struct comedi_device *dev,
 {
 	const struct labpc_boardinfo *board = comedi_board(dev);
 
-	if (board->memory_mapped_io)
+	if (board->has_mmio)
 		return i8254_mm_load((void __iomem *)base_address, 0,
 				     counter_number, count, mode);
 	else
@@ -1688,7 +1688,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
 	}
 	dev->iobase = iobase;
 
-	if (board->memory_mapped_io) {
+	if (board->has_mmio) {
 		devpriv->read_byte = labpc_readb;
 		devpriv->write_byte = labpc_writeb;
 	} else {
@@ -1798,7 +1798,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
 	s = &dev->subdevices[2];
 	/*  if board uses io memory we have to give a custom callback
 	 * function to the 8255 driver */
-	if (board->memory_mapped_io)
+	if (board->has_mmio)
 		subdev_8255_init(dev, s, labpc_dio_mem_callback,
 				 (unsigned long)(dev->iobase + DIO_BASE_REG));
 	else
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.h b/trunk/drivers/staging/comedi/drivers/ni_labpc.h
index 5976760cf755..38106568783e 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc.h
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc.h
@@ -50,7 +50,7 @@ struct labpc_boardinfo {
 	unsigned ai_scan_up:1;
 
 	/* uses memory mapped io instead of ioports */
-	unsigned memory_mapped_io:1;
+	unsigned has_mmio:1;
 };
 
 struct labpc_private {