diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /include/linux/auto_dev-ioctl.h | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/linux/auto_dev-ioctl.h')
| -rw-r--r-- | include/linux/auto_dev-ioctl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/auto_dev-ioctl.h b/include/linux/auto_dev-ioctl.h index 91a773993a5c..850f39b33e74 100644 --- a/include/linux/auto_dev-ioctl.h +++ b/include/linux/auto_dev-ioctl.h | |||
| @@ -10,8 +10,13 @@ | |||
| 10 | #ifndef _LINUX_AUTO_DEV_IOCTL_H | 10 | #ifndef _LINUX_AUTO_DEV_IOCTL_H |
| 11 | #define _LINUX_AUTO_DEV_IOCTL_H | 11 | #define _LINUX_AUTO_DEV_IOCTL_H |
| 12 | 12 | ||
| 13 | #include <linux/auto_fs.h> | ||
| 14 | |||
| 15 | #ifdef __KERNEL__ | ||
| 13 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 14 | #include <linux/types.h> | 17 | #else |
| 18 | #include <string.h> | ||
| 19 | #endif /* __KERNEL__ */ | ||
| 15 | 20 | ||
| 16 | #define AUTOFS_DEVICE_NAME "autofs" | 21 | #define AUTOFS_DEVICE_NAME "autofs" |
| 17 | 22 | ||