summaryrefslogtreecommitdiffstats
path: root/include/linux/devfs_fs_kernel.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
commitdbe1ab9514c231c9b062140a107d9dea0eabefcc (patch)
tree0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/linux/devfs_fs_kernel.h
parent612eff0e3715a6faff5ba1b74873b99e036c59fe (diff)
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff)
downloadcachepc-linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.gz
cachepc-linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/devfs_fs_kernel.h')
-rw-r--r--include/linux/devfs_fs_kernel.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index 89810e73d256..0d74a6f22abc 100644
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -2,7 +2,6 @@
#define _LINUX_DEVFS_FS_KERNEL_H
#include <linux/fs.h>
-#include <linux/config.h>
#include <linux/spinlock.h>
#include <linux/types.h>