From e1f7e505e6277d92eb2366e6efc528e0afb0f01d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 13 Jun 2012 15:42:51 -0700
Subject: [PATCH] --- yaml --- r: 317368 b: refs/heads/master c:
 f9af899b0c6c778083d1040349930a0f9fffb525 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/comedi/drivers/8255.c | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 768d79c2d60c..ae49618895a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 459f299e5b1759644a6cde8328919b6e542fb9eb
+refs/heads/master: f9af899b0c6c778083d1040349930a0f9fffb525
diff --git a/trunk/drivers/staging/comedi/drivers/8255.c b/trunk/drivers/staging/comedi/drivers/8255.c
index da374dee9bc0..abbb6d4d10d1 100644
--- a/trunk/drivers/staging/comedi/drivers/8255.c
+++ b/trunk/drivers/staging/comedi/drivers/8255.c
@@ -102,6 +102,16 @@ struct subdev_8255_private {
 	int (*io) (int, int, int, unsigned long);
 };
 
+static int subdev_8255_io(int dir, int port, int data, unsigned long iobase)
+{
+	if (dir) {
+		outb(data, iobase + port);
+		return 0;
+	} else {
+		return inb(iobase + port);
+	}
+}
+
 void subdev_8255_interrupt(struct comedi_device *dev,
 			   struct comedi_subdevice *s)
 {
@@ -119,16 +129,6 @@ void subdev_8255_interrupt(struct comedi_device *dev,
 }
 EXPORT_SYMBOL(subdev_8255_interrupt);
 
-static int subdev_8255_io(int dir, int port, int data, unsigned long iobase)
-{
-	if (dir) {
-		outb(data, iobase + port);
-		return 0;
-	} else {
-		return inb(iobase + port);
-	}
-}
-
 static int subdev_8255_insn(struct comedi_device *dev,
 			    struct comedi_subdevice *s,
 			    struct comedi_insn *insn, unsigned int *data)