From d53d0455903dd0bd337f875ca396368c42ad25e8 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 30 Jan 2013 16:48:15 -0700
Subject: [PATCH] --- yaml --- r: 354329 b: refs/heads/master c:
 89d714ce630cef6f6106f23a89458699cc595b04 h: refs/heads/master i:   354327:
 ed44bfaff003bf5f6696f5a4fefbc5ec32a22262 v: v3

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

diff --git a/[refs] b/[refs]
index a9fe67506b1f..6a3ef4594739 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a1daad46a99f1f33b2559ff87a0fb9b01a07c87
+refs/heads/master: 89d714ce630cef6f6106f23a89458699cc595b04
diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
index e491375321fd..53fd4d0f88df 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -37,18 +37,14 @@ This is just a wrapper around the 8255.o driver to properly handle
 the PCMCIA interface.
 */
 
-#include <linux/interrupt.h>
-#include <linux/slab.h>
 #include "../comedidev.h"
 
-#include <linux/ioport.h>
-
-#include "8255.h"
-
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
 
+#include "8255.h"
+
 static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
 				    void *priv_data)
 {