diff options
| author | Petr Vandrovec <vandrove@vc.cvut.cz> | 2002-07-18 23:24:46 +0200 |
|---|---|---|
| committer | Petr Vandrovec <vandrove@vc.cvut.cz> | 2002-07-18 23:24:46 +0200 |
| commit | 275d178366f4df0dc12fe79f72c732d6a369a07d (patch) | |
| tree | 178f5ae14dd6bae195f741782532e03e86c7cfd7 | |
| parent | 0f51d45f9e734d02ebc2079d51bb48ae8330b63b (diff) | |
Decide whether to build fs/ncpfs/symlinks.c or not in Makefile and not through
ifdefing whole file out. It should make Al happier.
| -rw-r--r-- | fs/ncpfs/Makefile | 8 | ||||
| -rw-r--r-- | fs/ncpfs/symlink.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/fs/ncpfs/Makefile b/fs/ncpfs/Makefile index 26cd285c7dfd..f28ef2850982 100644 --- a/fs/ncpfs/Makefile +++ b/fs/ncpfs/Makefile @@ -5,7 +5,13 @@ obj-$(CONFIG_NCP_FS) += ncpfs.o ncpfs-objs := dir.o file.o inode.o ioctl.o mmap.o ncplib_kernel.o sock.o \ - symlink.o ncpsign_kernel.o + ncpsign_kernel.o +ifeq ($(CONFIG_NCPFS_EXTRAS),y) +ncpfs-objs += symlink.o +endif +ifeq ($(CONFIG_NCPFS_NFS_NS),y) +ncpfs-objs += symlink.o +endif # If you want debugging output, please uncomment the following line # EXTRA_CFLAGS += -DDEBUG_NCP=1 diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c index 6f4fb98bf511..f07f5669c61f 100644 --- a/fs/ncpfs/symlink.c +++ b/fs/ncpfs/symlink.c @@ -22,8 +22,6 @@ #include <linux/config.h> -#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS) - #include <asm/uaccess.h> #include <linux/errno.h> @@ -117,11 +115,9 @@ int ncp_symlink(struct inode *dir, struct dentry *dentry, const char *symname) { DPRINTK("ncp_symlink(dir=%p,dentry=%p,symname=%s)\n",dir,dentry,symname); -#ifdef CONFIG_NCPFS_NFS_NS if (ncp_is_nfs_extras(NCP_SERVER(dir), NCP_FINFO(dir)->volNumber)) kludge = 0; else -#endif #ifdef CONFIG_NCPFS_EXTRAS if (NCP_SERVER(dir)->m.flags & NCP_MOUNT_SYMLINKS) kludge = 1; @@ -182,6 +178,5 @@ failfree:; kfree(rawlink); return err; } -#endif /* ----- EOF ----- */ |