From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752524AbXEZXty (ORCPT ); Sat, 26 May 2007 19:49:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751774AbXEZXtr (ORCPT ); Sat, 26 May 2007 19:49:47 -0400 Received: from ug-out-1314.google.com ([66.249.92.168]:5965 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbXEZXtp (ORCPT ); Sat, 26 May 2007 19:49:45 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:from:to:subject:date:user-agent:cc:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=oOH7FTn+kSW/fP3CJBlWEU9Y24ZON3HAX8/O+5mif9TDRKuU+Lqlx2Sj2dsex5S/Mh1neO90fIDBHFV7hdQypU/0GOSWYrhHnxpG/ZTEmnlNZkSyFwuBh54bRsk8USmV0RqpAqf6UdZS1Gz/gZ8JjBBeEqiZomYBiQlkfgaGP18= From: Jesper Juhl To: Linux Kernel Mailing List Subject: [PATCH] Remove the last few UMSDOS leftovers Date: Sun, 27 May 2007 01:50:39 +0200 User-Agent: KMail/1.9.6 Cc: Jacques Gelinas , Matija Nalis , Michael Elizabeth Chastain , Volker Lendecke , "H. Peter Anvin" , Mikael Starvik , Ian Molton , Jeff Dike , trivial@kernel.org, Jesper Juhl MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200705270150.39893.jesper.juhl@gmail.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org (sorry about the long Cc: list for such a trivial patch, but I wanted to include everyone who's stuff I'm changing) The UMSDOS filesystem was removed back in 2.6.11, but some tiny bits stuck around. This patch removes the few 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. Signed-off-by: Jesper Juhl --- Documentation/ioctl-number.txt | 2 +- arch/arm26/defconfig | 1 - arch/cris/arch-v10/defconfig | 1 - arch/um/config.release | 1 - include/linux/ncp_fs.h | 2 -- 5 files changed, 1 insertions(+), 6 deletions(-) diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 3de7d37..5c7fbf9 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. 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 c4a8970..2b7d44b 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 2a3411e..710c20b 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/arch/um/config.release b/arch/um/config.release index fc68bcb..aba42f8 100644 --- a/arch/um/config.release +++ b/arch/um/config.release @@ -200,7 +200,6 @@ CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FAT_FS=y CONFIG_MSDOS_FS=y -CONFIG_UMSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_EFS_FS=m # CONFIG_JFFS_FS is not set diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 83e39eb..88766e4 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h @@ -148,8 +148,6 @@ struct ncp_nls_ioctl #include #include -/* 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)