Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / include / linux / rio_drv.h

diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index f54772d..90987b7 100644 (file)
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -13,10 +13,7 @@
 #ifndef LINUX_RIO_DRV_H
 #define LINUX_RIO_DRV_H
 
-#ifdef __KERNEL__
-
 #include <linux/types.h>
-#include <linux/config.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
 #include <linux/errno.h>
@@ -466,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);
 
-#endif                         /* __KERNEL__ */
 #endif                         /* LINUX_RIO_DRV_H */