diff options
| -rw-r--r-- | Documentation/ioctl-number.txt | 2 | ||||
| -rw-r--r-- | arch/arm26/defconfig | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v10/defconfig | 1 | ||||
| -rw-r--r-- | include/linux/ncp_fs.h | 2 |
4 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 3de7d379cf0..5c7fbf9d96b 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt @@ -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 diff --git a/arch/arm26/defconfig b/arch/arm26/defconfig index c4a89703c3d..2b7d44bf49b 100644 --- a/arch/arm26/defconfig +++ b/arch/arm26/defconfig @@ -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 diff --git a/arch/cris/arch-v10/defconfig b/arch/cris/arch-v10/defconfig index 2a3411eaace..710c20ba2be 100644 --- a/arch/cris/arch-v10/defconfig +++ b/arch/cris/arch-v10/defconfig @@ -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 diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 83e39eb054d..88766e43e12 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h @@ -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) |