diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /fs/ncpfs/ioctl.c | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'fs/ncpfs/ioctl.c')
| -rw-r--r-- | fs/ncpfs/ioctl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index 4b6afe2e9..37c87f8b2 100644 --- a/fs/ncpfs/ioctl.c +++ b/fs/ncpfs/ioctl.c @@ -165,7 +165,6 @@ int ncp_ioctl(struct inode *inode, struct file *filp, return 0; } -#ifdef CONFIG_NCPFS_MOUNT_SUBDIR case NCP_IOC_GETROOT: { struct ncp_setroot_ioctl sr; @@ -241,7 +240,6 @@ int ncp_ioctl(struct inode *inode, struct file *filp, return 0; } -#endif /* CONFIG_NCPFS_MOUNT_SUBDIR */ #ifdef CONFIG_NCPFS_PACKET_SIGNING case NCP_IOC_SIGN_INIT: @@ -374,7 +372,6 @@ outrel: } #endif /* CONFIG_NCPFS_IOCTL_LOCKING */ -#ifdef CONFIG_NCPFS_NDS_DOMAINS case NCP_IOC_GETOBJECTNAME: if (current->uid != server->m.mounted_uid) { return -EACCES; @@ -503,7 +500,6 @@ outrel: if (old) ncp_kfree_s(old, oldlen); return 0; } -#endif /* CONFIG_NCPFS_NDS_DOMAINS */ #ifdef CONFIG_NCPFS_NLS /* Here we are select the iocharset and the codepage for NLS. |