diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-19 01:09:05 -0400 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-19 01:09:05 -0400 |
| commit | c203e45f069af47ca7623e4dcd8c00bfba2722e4 (patch) | |
| tree | 4563115b6565dcfd97015c1c9366fb3d07cabf19 /include/linux/cdev.h | |
| parent | a94477da38e0b261a7ecea71f4c95a3bcd5be69c (diff) | |
| parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/linux/cdev.h')
| -rw-r--r-- | include/linux/cdev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/cdev.h b/include/linux/cdev.h index 1e29b13d0062..fb4591977b03 100644 --- a/include/linux/cdev.h +++ b/include/linux/cdev.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #ifndef _LINUX_CDEV_H | 1 | #ifndef _LINUX_CDEV_H |
| 2 | #define _LINUX_CDEV_H | 2 | #define _LINUX_CDEV_H |
| 3 | #ifdef __KERNEL__ | ||
| 4 | 3 | ||
| 5 | #include <linux/kobject.h> | 4 | #include <linux/kobject.h> |
| 6 | #include <linux/kdev_t.h> | 5 | #include <linux/kdev_t.h> |
| @@ -34,4 +33,3 @@ void cd_forget(struct inode *); | |||
| 34 | extern struct backing_dev_info directly_mappable_cdev_bdi; | 33 | extern struct backing_dev_info directly_mappable_cdev_bdi; |
| 35 | 34 | ||
| 36 | #endif | 35 | #endif |
| 37 | #endif | ||