diff --git a/MAINTAINERS b/MAINTAINERS index 56cc7261c7e45b7899a317c93041cd19e8775141..630a19e2b2b4fd07071032eef4fb41e5f42095f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9362,7 +9362,7 @@ F: drivers/net/ethernet/natsemi/natsemi.c NCP FILESYSTEM M: Petr Vandrovec S: Odd Fixes -F: fs/ncpfs/ +F: drivers/staging/ncpfs/ NCR 5380 SCSI DRIVERS M: Finn Thain diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 3744640bed5a861ed124c99476bcc988c0ccbe78..e95ab683331e7fdb2329675b28814de08d1eea7b 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -28,6 +28,8 @@ source "drivers/staging/irda/net/Kconfig" source "drivers/staging/ipx/Kconfig" +source "drivers/staging/ncpfs/Kconfig" + source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f4c0506470ffe9b5fb5340e11cd356f053be740b..af8cd6a3a1f6d1da721831ef6d89d42533611c5f 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -4,6 +4,7 @@ obj-y += media/ obj-y += typec/ obj-$(CONFIG_IPX) += ipx/ +obj-$(CONFIG_NCP_FS) += ncpfs/ obj-$(CONFIG_IRDA) += irda/net/ obj-$(CONFIG_IRDA) += irda/drivers/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ diff --git a/fs/ncpfs/Kconfig b/drivers/staging/ncpfs/Kconfig similarity index 100% rename from fs/ncpfs/Kconfig rename to drivers/staging/ncpfs/Kconfig diff --git a/fs/ncpfs/Makefile b/drivers/staging/ncpfs/Makefile similarity index 100% rename from fs/ncpfs/Makefile rename to drivers/staging/ncpfs/Makefile diff --git a/drivers/staging/ncpfs/TODO b/drivers/staging/ncpfs/TODO new file mode 100644 index 0000000000000000000000000000000000000000..9b6d38b7e248b81158257c42630bc3d89350ff7b --- /dev/null +++ b/drivers/staging/ncpfs/TODO @@ -0,0 +1,4 @@ +The ncpfs code will be removed soon from the kernel tree as it is old and +obsolete and broken. + +Don't worry about fixing up anything here, it's not needed. diff --git a/fs/ncpfs/dir.c b/drivers/staging/ncpfs/dir.c similarity index 100% rename from fs/ncpfs/dir.c rename to drivers/staging/ncpfs/dir.c diff --git a/fs/ncpfs/file.c b/drivers/staging/ncpfs/file.c similarity index 100% rename from fs/ncpfs/file.c rename to drivers/staging/ncpfs/file.c diff --git a/fs/ncpfs/getopt.c b/drivers/staging/ncpfs/getopt.c similarity index 100% rename from fs/ncpfs/getopt.c rename to drivers/staging/ncpfs/getopt.c diff --git a/fs/ncpfs/getopt.h b/drivers/staging/ncpfs/getopt.h similarity index 100% rename from fs/ncpfs/getopt.h rename to drivers/staging/ncpfs/getopt.h diff --git a/fs/ncpfs/inode.c b/drivers/staging/ncpfs/inode.c similarity index 100% rename from fs/ncpfs/inode.c rename to drivers/staging/ncpfs/inode.c diff --git a/fs/ncpfs/ioctl.c b/drivers/staging/ncpfs/ioctl.c similarity index 100% rename from fs/ncpfs/ioctl.c rename to drivers/staging/ncpfs/ioctl.c diff --git a/fs/ncpfs/mmap.c b/drivers/staging/ncpfs/mmap.c similarity index 100% rename from fs/ncpfs/mmap.c rename to drivers/staging/ncpfs/mmap.c diff --git a/fs/ncpfs/ncp_fs.h b/drivers/staging/ncpfs/ncp_fs.h similarity index 100% rename from fs/ncpfs/ncp_fs.h rename to drivers/staging/ncpfs/ncp_fs.h diff --git a/fs/ncpfs/ncp_fs_i.h b/drivers/staging/ncpfs/ncp_fs_i.h similarity index 100% rename from fs/ncpfs/ncp_fs_i.h rename to drivers/staging/ncpfs/ncp_fs_i.h diff --git a/fs/ncpfs/ncp_fs_sb.h b/drivers/staging/ncpfs/ncp_fs_sb.h similarity index 100% rename from fs/ncpfs/ncp_fs_sb.h rename to drivers/staging/ncpfs/ncp_fs_sb.h diff --git a/fs/ncpfs/ncplib_kernel.c b/drivers/staging/ncpfs/ncplib_kernel.c similarity index 100% rename from fs/ncpfs/ncplib_kernel.c rename to drivers/staging/ncpfs/ncplib_kernel.c diff --git a/fs/ncpfs/ncplib_kernel.h b/drivers/staging/ncpfs/ncplib_kernel.h similarity index 100% rename from fs/ncpfs/ncplib_kernel.h rename to drivers/staging/ncpfs/ncplib_kernel.h diff --git a/fs/ncpfs/ncpsign_kernel.c b/drivers/staging/ncpfs/ncpsign_kernel.c similarity index 100% rename from fs/ncpfs/ncpsign_kernel.c rename to drivers/staging/ncpfs/ncpsign_kernel.c diff --git a/fs/ncpfs/ncpsign_kernel.h b/drivers/staging/ncpfs/ncpsign_kernel.h similarity index 100% rename from fs/ncpfs/ncpsign_kernel.h rename to drivers/staging/ncpfs/ncpsign_kernel.h diff --git a/fs/ncpfs/sock.c b/drivers/staging/ncpfs/sock.c similarity index 100% rename from fs/ncpfs/sock.c rename to drivers/staging/ncpfs/sock.c diff --git a/fs/ncpfs/symlink.c b/drivers/staging/ncpfs/symlink.c similarity index 100% rename from fs/ncpfs/symlink.c rename to drivers/staging/ncpfs/symlink.c diff --git a/fs/Kconfig b/fs/Kconfig index 7aee6d699fd6b38949df0563281473c3afb445c2..eaf968bf9cfc4fe6a7b1dc42e7e407d8ad87a4dc 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -298,7 +298,6 @@ config NFS_COMMON source "net/sunrpc/Kconfig" source "fs/ceph/Kconfig" source "fs/cifs/Kconfig" -source "fs/ncpfs/Kconfig" source "fs/coda/Kconfig" source "fs/afs/Kconfig" source "fs/9p/Kconfig" diff --git a/fs/Makefile b/fs/Makefile index ef772f1eaff80ade97232f502bb4c8915e87cdac..add789ea270ad703e9502efad6e3f4070bbae47b 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -92,7 +92,6 @@ obj-$(CONFIG_LOCKD) += lockd/ obj-$(CONFIG_NLS) += nls/ obj-$(CONFIG_SYSV_FS) += sysv/ obj-$(CONFIG_CIFS) += cifs/ -obj-$(CONFIG_NCP_FS) += ncpfs/ obj-$(CONFIG_HPFS_FS) += hpfs/ obj-$(CONFIG_NTFS_FS) += ntfs/ obj-$(CONFIG_UFS_FS) += ufs/