diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-10-24 12:26:22 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 19:22:30 -0500 |
commit | f37a7238d379bc2befbcb08a03de03f4f446131c (patch) | |
tree | 87180607d9e5cd9abd7c086c17bf34d04cc18476 | |
parent | f10ab66fa564fd624b04fe207ccae206df85efbf (diff) |
[SCSI] 53c7xx: fix removal fallout
This patch does some additional cleanups after the 53c7xx removal.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r-- | Documentation/dontdiff | 2 | ||||
-rw-r--r-- | Documentation/m68k/kernel-options.txt | 60 | ||||
-rw-r--r-- | Documentation/scsi/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/scsi/ncr53c7xx.txt | 40 | ||||
-rw-r--r-- | drivers/scsi/.gitignore | 2 |
5 files changed, 0 insertions, 106 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index f2d658a6a942..c09a96b99354 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
@@ -46,8 +46,6 @@ | |||
46 | .mailmap | 46 | .mailmap |
47 | .mm | 47 | .mm |
48 | 53c700_d.h | 48 | 53c700_d.h |
49 | 53c7xx_d.h | ||
50 | 53c7xx_u.h | ||
51 | 53c8xx_d.h* | 49 | 53c8xx_d.h* |
52 | BitKeeper | 50 | BitKeeper |
53 | COPYING | 51 | COPYING |
diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt index 248589e8bcf5..c93bed66e25d 100644 --- a/Documentation/m68k/kernel-options.txt +++ b/Documentation/m68k/kernel-options.txt | |||
@@ -867,66 +867,6 @@ controller and should be autodetected by the driver. An example is the | |||
867 | 24 bit region which is specified by a mask of 0x00fffffe. | 867 | 24 bit region which is specified by a mask of 0x00fffffe. |
868 | 868 | ||
869 | 869 | ||
870 | 5.5) 53c7xx= | ||
871 | ------------ | ||
872 | |||
873 | Syntax: 53c7xx=<sub-options...> | ||
874 | |||
875 | These options affect the A4000T, A4091, WarpEngine, Blizzard 603e+, | ||
876 | and GForce 040/060 SCSI controllers on the Amiga, as well as the | ||
877 | builtin MVME 16x SCSI controller. | ||
878 | |||
879 | The <sub-options> is a comma-separated list of the sub-options listed | ||
880 | below. | ||
881 | |||
882 | 5.5.1) nosync | ||
883 | ------------- | ||
884 | |||
885 | Syntax: nosync:0 | ||
886 | |||
887 | Disables sync negotiation for all devices. Any value after the | ||
888 | colon is acceptable (and has the same effect). | ||
889 | |||
890 | 5.5.2) noasync | ||
891 | -------------- | ||
892 | |||
893 | [OBSOLETE, REMOVED] | ||
894 | |||
895 | 5.5.3) nodisconnect | ||
896 | ------------------- | ||
897 | |||
898 | Syntax: nodisconnect:0 | ||
899 | |||
900 | Disables SCSI disconnects. Any value after the colon is acceptable | ||
901 | (and has the same effect). | ||
902 | |||
903 | 5.5.4) validids | ||
904 | --------------- | ||
905 | |||
906 | Syntax: validids:0xNN | ||
907 | |||
908 | Specify which SCSI ids the driver should pay attention to. This is | ||
909 | a bitmask (i.e. to only pay attention to ID#4, you'd use 0x10). | ||
910 | Default is 0x7f (devices 0-6). | ||
911 | |||
912 | 5.5.5) opthi | ||
913 | 5.5.6) optlo | ||
914 | ------------ | ||
915 | |||
916 | Syntax: opthi:M,optlo:N | ||
917 | |||
918 | Specify options for "hostdata->options". The acceptable definitions | ||
919 | are listed in drivers/scsi/53c7xx.h; the 32 high bits should be in | ||
920 | opthi and the 32 low bits in optlo. They must be specified in the | ||
921 | order opthi=M,optlo=N. | ||
922 | |||
923 | 5.5.7) next | ||
924 | ----------- | ||
925 | |||
926 | No argument. Used to separate blocks of keywords when there's more | ||
927 | than one 53c7xx host adapter in the system. | ||
928 | |||
929 | |||
930 | /* Local Variables: */ | 870 | /* Local Variables: */ |
931 | /* mode: text */ | 871 | /* mode: text */ |
932 | /* End: */ | 872 | /* End: */ |
diff --git a/Documentation/scsi/00-INDEX b/Documentation/scsi/00-INDEX index aa1f7e927834..c2e18e109858 100644 --- a/Documentation/scsi/00-INDEX +++ b/Documentation/scsi/00-INDEX | |||
@@ -64,8 +64,6 @@ lpfc.txt | |||
64 | - LPFC driver release notes | 64 | - LPFC driver release notes |
65 | megaraid.txt | 65 | megaraid.txt |
66 | - Common Management Module, shared code handling ioctls for LSI drivers | 66 | - Common Management Module, shared code handling ioctls for LSI drivers |
67 | ncr53c7xx.txt | ||
68 | - info on driver for NCR53c7xx based adapters | ||
69 | ncr53c8xx.txt | 67 | ncr53c8xx.txt |
70 | - info on driver for NCR53c8xx based adapters | 68 | - info on driver for NCR53c8xx based adapters |
71 | osst.txt | 69 | osst.txt |
diff --git a/Documentation/scsi/ncr53c7xx.txt b/Documentation/scsi/ncr53c7xx.txt deleted file mode 100644 index 91e9552d63e5..000000000000 --- a/Documentation/scsi/ncr53c7xx.txt +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | README for WarpEngine/A4000T/A4091 SCSI kernels. | ||
2 | |||
3 | Use the following options to disable options in the SCSI driver. | ||
4 | |||
5 | Using amiboot for example..... | ||
6 | |||
7 | To disable Synchronous Negotiation.... | ||
8 | |||
9 | amiboot -k kernel 53c7xx=nosync:0 | ||
10 | |||
11 | To disable Disconnection.... | ||
12 | |||
13 | amiboot -k kernel 53c7xx=nodisconnect:0 | ||
14 | |||
15 | To disable certain SCSI devices... | ||
16 | |||
17 | amiboot -k kernel 53c7xx=validids:0x3F | ||
18 | |||
19 | this allows only device ID's 0,1,2,3,4 and 5 for linux to handle. | ||
20 | (this is a bitmasked field - i.e. each bit represents a SCSI ID) | ||
21 | |||
22 | These commands work on a per controller basis and use the option 'next' to | ||
23 | move to the next controller in the system. | ||
24 | |||
25 | e.g. | ||
26 | amiboot -k kernel 53c7xx=nodisconnect:0,next,nosync:0 | ||
27 | |||
28 | this uses No Disconnection on the first controller and Asynchronous | ||
29 | SCSI on the second controller. | ||
30 | |||
31 | Known Issues: | ||
32 | |||
33 | Two devices are known not to function with the default settings of using | ||
34 | synchronous SCSI. These are the Archive Viper 150 Tape Drive and the | ||
35 | SyQuest SQ555 removeable hard drive. When using these devices on a controller | ||
36 | use the 'nosync:0' option. | ||
37 | |||
38 | Please try these options and post any problems/successes to me. | ||
39 | |||
40 | Alan Hourihane <alanh@fairlite.demon.co.uk> | ||
diff --git a/drivers/scsi/.gitignore b/drivers/scsi/.gitignore index b385af314356..c89ae9a04399 100644 --- a/drivers/scsi/.gitignore +++ b/drivers/scsi/.gitignore | |||
@@ -1,3 +1 @@ | |||
1 | 53c700_d.h | 53c700_d.h | |
2 | 53c7xx_d.h | ||
3 | 53c7xx_u.h | ||