From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 27 Apr 2010 23:04:13 +0000 (-0700)
Subject: Staging: dt3155.h: remove #ifdef
X-Git-Tag: v2.6.35-rc1~441^2^2~476
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e43a0edcb066935268b60c3444e30423bfee664c;p=karo-tx-linux.git

Staging: dt3155.h: remove #ifdef

We are in the kernel now, don't check to see if we are not.

Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Scott Smedley <ss@aao.gov.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/dt3155/dt3155.h b/drivers/staging/dt3155/dt3155.h
index 1bf786364eec..37d9fc6d0636 100644
--- a/drivers/staging/dt3155/dt3155.h
+++ b/drivers/staging/dt3155/dt3155.h
@@ -34,15 +34,8 @@ MA 02111-1307 USA
 #ifndef _DT3155_INC
 #define _DT3155_INC
 
-#ifdef __KERNEL__
 #include <linux/types.h>
 #include <linux/time.h>		/* struct timeval */
-#else
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <unistd.h>
-#endif
 
 
 #define TRUE  1