diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:48:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:48:20 -0400 |
| commit | 14dc5249728ff699b1ca4dac01ad416a350a147a (patch) | |
| tree | 4ffd91101601f55c5e0b53a00f03534b7e044ac4 /Documentation/m68k/kernel-options.txt | |
| parent | 02b2318e07f98a7cdf7089a4457a8d62424aa824 (diff) | |
| parent | bcd4f3acbaec102e2b8000c977ecc38dcd0fe367 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
splice: direct splicing updates ppos twice
more ACSI removal
umem: Fix match of pci_ids in umem driver
umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
remove the documentation for the legacy CDROM drivers
Diffstat (limited to 'Documentation/m68k/kernel-options.txt')
| -rw-r--r-- | Documentation/m68k/kernel-options.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt index 1c41db21d3c1..59108cebe163 100644 --- a/Documentation/m68k/kernel-options.txt +++ b/Documentation/m68k/kernel-options.txt | |||
| @@ -82,13 +82,6 @@ Valid names are: | |||
| 82 | /dev/fd : -> 0x0200 (floppy disk) | 82 | /dev/fd : -> 0x0200 (floppy disk) |
| 83 | /dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k) | 83 | /dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k) |
| 84 | /dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k) | 84 | /dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k) |
| 85 | /dev/ada: -> 0x1c00 (first ACSI device) | ||
| 86 | /dev/adb: -> 0x1c10 (second ACSI device) | ||
| 87 | /dev/adc: -> 0x1c20 (third ACSI device) | ||
| 88 | /dev/add: -> 0x1c30 (forth ACSI device) | ||
| 89 | |||
| 90 | The last four names are available only if the kernel has been compiled | ||
| 91 | with Atari and ACSI support. | ||
| 92 | 85 | ||
| 93 | The name must be followed by a decimal number, that stands for the | 86 | The name must be followed by a decimal number, that stands for the |
| 94 | partition number. Internally, the value of the number is just | 87 | partition number. Internally, the value of the number is just |