OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d4984d
)
Staging: dt3155.h: remove #ifdef
author
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 27 Apr 2010 23:04:13 +0000
(16:04 -0700)
committer
Greg 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
patch
|
blob
|
history
diff --git
a/drivers/staging/dt3155/dt3155.h
b/drivers/staging/dt3155/dt3155.h
index
1bf7863
..
37d9fc6
100644
(file)
--- 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