[PATCH] block: remove refs to XD disks from documentation

[PATCH] block: remove refs to XD disks from documentation

[Linus Walleij]

Commit d1a6f4f19728d6e90480e53601a90fc9f6a348ad
"block: delete super ancient PC-XT driver for 1980's hardware"
deleted the XD disk driver, but there are still a few
references to it in the documentation directory. Delete
the remnants and thus also free up the major block device
13 for reuse.

Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 Documentation/devices.txt             | 7 +------
 Documentation/kernel-parameters.txt   | 3 ---
 Documentation/m68k/kernel-options.txt | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 08f01e7..0683e83 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -498,12 +498,7 @@ Your cooperation is appreciated.
 
 		Each device type has 5 bits (32 minors).
 
- 13 block	8-bit MFM/RLL/IDE controller
-		  0 = /dev/xda		First XT disk whole disk
-		 64 = /dev/xdb		Second XT disk whole disk
-
-		Partitions are handled in the same way as IDE disks
-		(see major number 3).
+ 13 block
 
  14 char	Open Sound System (OSS)
 		  0 = /dev/mixer	Mixer control
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c3bfacb..5469dbf 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3330,9 +3330,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			plus one apbt timer for broadcast timer.
 			x86_mrst_timer=apbt_only | lapic_and_apbt
 
-	xd=		[HW,XT] Original XT pre-IDE (RLL encoded) disks.
-	xd_geo=		See header of drivers/block/xd.c.
-
 	xen_emul_unplug=		[HW,X86,XEN]
 			Unplug Xen emulated devices
 			Format: [unplug0,][unplug1]
diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
index 97d45f2..eaf32a1 100644
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
@@ -80,8 +80,6 @@ Valid names are:
   /dev/sdd: -> 0x0830 (forth SCSI disk)
   /dev/sde: -> 0x0840 (fifth SCSI disk)
   /dev/fd : -> 0x0200 (floppy disk)
-  /dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k)
-  /dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k)
 
   The name must be followed by a decimal number, that stands for the
 partition number. Internally, the value of the number is just
-- 
1.8.1.4

Re: [PATCH] block: remove refs to XD disks from documentation

[Paul Gortmaker]

On 13-05-12 11:23 AM, Linus Walleij wrote:
> Commit d1a6f4f19728d6e90480e53601a90fc9f6a348ad
> "block: delete super ancient PC-XT driver for 1980's hardware"
> deleted the XD disk driver, but there are still a few
> references to it in the documentation directory. Delete
> the remnants and thus also free up the major block device
> 13 for reuse.
> 
> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  Documentation/devices.txt             | 7 +------
>  Documentation/kernel-parameters.txt   | 3 ---
>  Documentation/m68k/kernel-options.txt | 2 --
>  3 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/Documentation/devices.txt b/Documentation/devices.txt
> index 08f01e7..0683e83 100644
> --- a/Documentation/devices.txt
> +++ b/Documentation/devices.txt
> @@ -498,12 +498,7 @@ Your cooperation is appreciated.
>  
>  		Each device type has 5 bits (32 minors).
>  
> - 13 block	8-bit MFM/RLL/IDE controller
> -		  0 = /dev/xda		First XT disk whole disk
> -		 64 = /dev/xdb		Second XT disk whole disk
> -
> -		Partitions are handled in the same way as IDE disks
> -		(see major number 3).
> + 13 block

Maybe rather than just blanking out the entry, you could instead
leave a short note saying that it was previously used for the
obsolete XT disk and removed in kernel version 3.9

Thanks,
Paul.
--

>  
>   14 char	Open Sound System (OSS)
>  		  0 = /dev/mixer	Mixer control
> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
> index c3bfacb..5469dbf 100644
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@ -3330,9 +3330,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
>  			plus one apbt timer for broadcast timer.
>  			x86_mrst_timer=apbt_only | lapic_and_apbt
>  
> -	xd=		[HW,XT] Original XT pre-IDE (RLL encoded) disks.
> -	xd_geo=		See header of drivers/block/xd.c.
> -
>  	xen_emul_unplug=		[HW,X86,XEN]
>  			Unplug Xen emulated devices
>  			Format: [unplug0,][unplug1]
> diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
> index 97d45f2..eaf32a1 100644
> --- a/Documentation/m68k/kernel-options.txt
> +++ b/Documentation/m68k/kernel-options.txt
> @@ -80,8 +80,6 @@ Valid names are:
>    /dev/sdd: -> 0x0830 (forth SCSI disk)
>    /dev/sde: -> 0x0840 (fifth SCSI disk)
>    /dev/fd : -> 0x0200 (floppy disk)
> -  /dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k)
> -  /dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k)
>  
>    The name must be followed by a decimal number, that stands for the
>  partition number. Internally, the value of the number is just
>