Commit d5298802 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

Remove the last few UMSDOS leftovers 



The UMSDOS filesystem was removed back in 2.6.11, but some tiny bits stuck
around.  This patch removes the few remaining leftovers.  The only things
left behind after this are the entries in the CREDITS file and the ioctl
number in Documentation/ioctl-number.txt as documentation.

This third (hopefully final) version of the patch doesn't edit the
arch/um/config.release file, since Jeff Dike pointed out to me that it
should die completely, and asked me to remove it from my patch as he'll
send in a seperate patch removing the file completely.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6b07d39

Documentation/ioctl-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ Code Seq# Include File Comments 
0x00	00-1F	linux/wavefront.h	conflict!

0x02	all	linux/fd.h

0x03	all	linux/hdreg.h

0x04	all	linux/umsdos_fs.h

0x04	D2-DC	linux/umsdos_fs.h	Dead since 2.6.11, but don't reuse these.

0x06	all	linux/lp.h

0x09	all	linux/md.h

0x12	all	linux/fs.h

arch/arm26/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ CONFIG_I2C_CHARDEV=y 
# CONFIG_JBD_DEBUG is not set

# CONFIG_FAT_FS is not set

# CONFIG_MSDOS_FS is not set

# CONFIG_UMSDOS_FS is not set

# CONFIG_VFAT_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_JFFS_FS is not set

arch/cris/arch-v10/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ CONFIG_NET_ETHERNET=y 
# CONFIG_BFS_FS is not set

# CONFIG_FAT_FS is not set

# CONFIG_MSDOS_FS is not set

# CONFIG_UMSDOS_FS is not set

# CONFIG_VFAT_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_JFFS_FS is not set

include/linux/ncp_fs.h

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ struct ncp_nls_ioctl 
#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

/* define because it is easy to change PRINTK to {*}PRINTK */

#define PRINTK(format, args...) printk(KERN_DEBUG format , ## args)

CRA Git | Maintained and supported by SUSTech CRA and CCSE