summaryrefslogtreecommitdiffstats
path: root/Documentation/m68k/kernel-options.txt
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 12:02:38 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 12:02:38 -0700
commit1508124d8a4e0995362d93d82e5555a74bfc998f (patch)
tree62b36e0fa03b40e68be6941c5139e8ff7653d0b2 /Documentation/m68k/kernel-options.txt
parent976f8bef9cfb5246bc0e8dc781562daa79cb7aaf (diff)
parent7d132055814ef17a6c7b69f342244c410a5e000f (diff)
downloadlinux-1508124d8a4e0995362d93d82e5555a74bfc998f.tar.bz2
Merge 3.10-rc6 into usb-next
We want the fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/m68k/kernel-options.txt')
-rw-r--r--Documentation/m68k/kernel-options.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
index 97d45f276fe6..eaf32a1fd0b1 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