diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/mount.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/mount.h')
| -rw-r--r-- | include/linux/mount.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h index b4836d58f428..4374d1adeb4b 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #ifndef _LINUX_MOUNT_H | 11 | #ifndef _LINUX_MOUNT_H |
| 12 | #define _LINUX_MOUNT_H | 12 | #define _LINUX_MOUNT_H |
| 13 | #ifdef __KERNEL__ | ||
| 14 | 13 | ||
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| @@ -114,5 +113,4 @@ extern void mark_mounts_for_expiry(struct list_head *mounts); | |||
| 114 | extern spinlock_t vfsmount_lock; | 113 | extern spinlock_t vfsmount_lock; |
| 115 | extern dev_t name_to_dev_t(char *name); | 114 | extern dev_t name_to_dev_t(char *name); |
| 116 | 115 | ||
| 117 | #endif | ||
| 118 | #endif /* _LINUX_MOUNT_H */ | 116 | #endif /* _LINUX_MOUNT_H */ |