summaryrefslogtreecommitdiffstats
path: root/include/linux/cdev.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-05-06 17:55:32 +0000
committerSteve French <sfrench@us.ibm.com>2008-05-06 17:55:32 +0000
commita815752ac0ffdb910e92958d41d28f4fb28e5296 (patch)
treea3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/cdev.h
parent5ade9deaaa3e1f7291467d97b238648e43eae15e (diff)
parenta15306365a16380f3bafee9e181ba01231d4acd7 (diff)
downloadkernel-crypto-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.gz
kernel-crypto-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.xz
kernel-crypto-a815752ac0ffdb910e92958d41d28f4fb28e5296.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/cdev.h')
-rw-r--r--include/linux/cdev.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/cdev.h b/include/linux/cdev.h
index 1e29b13d006..fb4591977b0 100644
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
@@ -1,6 +1,5 @@
#ifndef _LINUX_CDEV_H
#define _LINUX_CDEV_H
-#ifdef __KERNEL__
#include <linux/kobject.h>
#include <linux/kdev_t.h>
@@ -34,4 +33,3 @@ void cd_forget(struct inode *);
extern struct backing_dev_info directly_mappable_cdev_bdi;
#endif
-#endif