Staging: dt3155.h: remove #ifdef
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 27 Apr 2010 23:04:13 +0000 (16:04 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 18:35:40 +0000 (11:35 -0700)
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>
drivers/staging/dt3155/dt3155.h

index 1bf786364eecbf750004311eb30d2bb0a0f51e6c..37d9fc6d0636ba604cd392bda4aa116a3cdb22ae 100644 (file)
@@ -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