git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
ncp_fs.h
diff --git
a/include/linux/ncp_fs.h
b/include/linux/ncp_fs.h
index
96dc237
..
b208f0c
100644
(file)
--- a/
include/linux/ncp_fs.h
+++ b/
include/linux/ncp_fs.h
@@
-12,8
+12,6
@@
#include <linux/in.h>
#include <linux/types.h>
#include <linux/in.h>
#include <linux/types.h>
-#include <linux/ncp_fs_i.h>
-#include <linux/ncp_fs_sb.h>
#include <linux/ipx.h>
#include <linux/ncp_no.h>
#include <linux/ipx.h>
#include <linux/ncp_no.h>
@@
-146,7
+144,8
@@
struct ncp_nls_ioctl
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
+#include <linux/ncp_fs_i.h>
+#include <linux/ncp_fs_sb.h>
/* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */
#undef PRINTK
/* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */
#undef PRINTK