summaryrefslogtreecommitdiffstats
path: root/include/linux/lvm.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
commit116674acc97ba75a720329996877077d988443a2 (patch)
tree6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /include/linux/lvm.h
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'include/linux/lvm.h')
-rw-r--r--include/linux/lvm.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/lvm.h b/include/linux/lvm.h
index 4e95eb73d..e1e701a91 100644
--- a/include/linux/lvm.h
+++ b/include/linux/lvm.h
@@ -95,15 +95,8 @@
*/
#endif /* #ifdef __KERNEL__ */
-#ifndef __KERNEL__
-#define __KERNEL__
#include <linux/kdev_t.h>
#include <linux/list.h>
-#undef __KERNEL__
-#else
-#include <linux/kdev_t.h>
-#include <linux/list.h>
-#endif /* #ifndef __KERNEL__ */
#include <asm/types.h>
#include <linux/major.h>