projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[cascardo/linux.git]
/
include
/
linux
/
rio_drv.h
diff --git
a/include/linux/rio_drv.h
b/include/linux/rio_drv.h
index
7adb2a1
..
90987b7
100644
(file)
--- a/
include/linux/rio_drv.h
+++ b/
include/linux/rio_drv.h
@@
-13,8
+13,6
@@
#ifndef LINUX_RIO_DRV_H
#define LINUX_RIO_DRV_H
#ifndef LINUX_RIO_DRV_H
#define LINUX_RIO_DRV_H
-#ifdef __KERNEL__
-
#include <linux/types.h>
#include <linux/ioport.h>
#include <linux/list.h>
#include <linux/types.h>
#include <linux/ioport.h>
#include <linux/list.h>
@@
-465,5
+463,4
@@
extern struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from);
extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_did,
struct rio_dev *from);
extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_did,
struct rio_dev *from);
-#endif /* __KERNEL__ */
#endif /* LINUX_RIO_DRV_H */
#endif /* LINUX_RIO_DRV_H */