diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-09 20:12:06 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-09 20:12:06 +1000 |
| commit | 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (patch) | |
| tree | b2306840f227972a7c9d4a2b75e516fe81358ce8 /include/linux/rio_drv.h | |
| parent | 02539d71fa98d5737bb668b02286c76241e4bac9 (diff) | |
| parent | 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (diff) | |
| download | kernel_samsung_crespo-2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92.zip kernel_samsung_crespo-2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92.tar.gz kernel_samsung_crespo-2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92.tar.bz2 | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'include/linux/rio_drv.h')
| -rw-r--r-- | include/linux/rio_drv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h index 7adb2a1..90987b7 100644 --- 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 -#ifdef __KERNEL__ - #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); -#endif /* __KERNEL__ */ #endif /* LINUX_RIO_DRV_H */ |