diff options
Diffstat (limited to 'include/linux/kdev_t.h')
-rw-r--r-- | include/linux/kdev_t.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/kdev_t.h b/include/linux/kdev_t.h index 2dacab8beccb..c838abe3ee0a 100644 --- a/include/linux/kdev_t.h +++ b/include/linux/kdev_t.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_KDEV_T_H | 1 | #ifndef _LINUX_KDEV_T_H |
2 | #define _LINUX_KDEV_T_H | 2 | #define _LINUX_KDEV_T_H |
3 | #ifdef __KERNEL__ | 3 | |
4 | #include <uapi/linux/kdev_t.h> | ||
5 | |||
4 | #define MINORBITS 20 | 6 | #define MINORBITS 20 |
5 | #define MINORMASK ((1U << MINORBITS) - 1) | 7 | #define MINORMASK ((1U << MINORBITS) - 1) |
6 | 8 | ||
@@ -87,14 +89,4 @@ static inline unsigned sysv_minor(u32 dev) | |||
87 | return dev & 0x3ffff; | 89 | return dev & 0x3ffff; |
88 | } | 90 | } |
89 | 91 | ||
90 | #else /* __KERNEL__ */ | ||
91 | |||
92 | /* | ||
93 | Some programs want their definitions of MAJOR and MINOR and MKDEV | ||
94 | from the kernel sources. These must be the externally visible ones. | ||
95 | */ | ||
96 | #define MAJOR(dev) ((dev)>>8) | ||
97 | #define MINOR(dev) ((dev) & 0xff) | ||
98 | #define MKDEV(ma,mi) ((ma)<<8 | (mi)) | ||
99 | #endif /* __KERNEL__ */ | ||
100 | #endif | 92 | #endif |