Correct outdated aic entries.

Submitted by:	Greg Lewis <glewis@trc.adelaide.edu.au>
PR:		15186

4 files changed, 30 insertions, 34 deletions

diff --git a/release/texts/alpha/HARDWARE.TXT b/release/texts/alpha/HARDWARE.TXT
index e0ad542..aa4b8eb 100644
--- a/release/texts/alpha/HARDWARE.TXT
+++ b/release/texts/alpha/HARDWARE.TXT
@@ -66,7 +66,7 @@ uha0*   330     dyn     6       dyn     Ultrastore 14f
 aha0    330     dyn     5       dyn     Adaptec 154x/1535 SCSI controller
 ahb0    dyn     dyn     dyn     dyn     Adaptec 174x SCSI controller
 ahc0    dyn     dyn     dyn     dyn     Adaptec 274x/284x/294x SCSI controller
-aic0*   340     11      dyn     dyn     Adaptec 152x/AIC-6360 SCSI
+aic0    340     11      dyn     dyn     Adaptec 152x/AIC-6360/AIC-6260 SCSI
                                         controller
 isp0    dyn     dyn     dyn     dyn     QLogic 10X0, 2100 SCSI/FC controllers
 dpt     n/a     n/a     n/a     n/a     DPT RAID SCSI controllers.
@@ -217,6 +217,10 @@ Adaptec 174x series EISA SCSI controller in standard and enhanced mode.
 Adaptec 274X/284X/2920C/294x/2950/3940/3950 (Narrow/Wide/Twin) series
 EISA/VLB/PCI SCSI controllers.
 Adaptec AIC7850, AIC7860, AIC7880, AIC789x, on-board SCSI controllers.
+Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
+Adaptec 152x series ISA SCSI controllers
+Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
+and SoundBlaster SCSI cards.
 
 AdvanSys SCSI controllers (all models).
 
@@ -280,14 +284,9 @@ NOT YET supported under the new CAM SCSI subsystem:
 
   WD7000 SCSI controller.
 
-  Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
-  Adaptec 152x series ISA SCSI controllers
-  Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
-  and SoundBlaster SCSI cards.
-
-  [ Note:  There is work-in-progress to port the AIC-6260/6360 and
-    UltraStor drivers to the new CAM SCSI framework, but no estimates on
-    when or if they will be completed. ]
+  [ Note:  There is work-in-progress to port the UltraStor driver to 
+    the new CAM SCSI framework, but no estimates on when or if it will 
+    be completed. ]
 
 4.2.    Network cards
 ----    -------------
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 2b60e04..5c0f802 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -173,6 +173,10 @@ Adaptec 174x series EISA SCSI controller in standard and enhanced mode.
 Adaptec 274X/284X/2920C/294x/2950/3940/3950 (Narrow/Wide/Twin) series
 EISA/VLB/PCI SCSI controllers.
 Adaptec AIC7850, AIC7860, AIC7880, AIC789x, on-board SCSI controllers.
+Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
+Adaptec 152x series ISA SCSI controllers
+Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
+and SoundBlaster SCSI cards.
 
 AdvanSys SCSI controllers (all models).
 
@@ -245,14 +249,9 @@ NOT YET supported under the new CAM SCSI subsystem:
 
   WD7000 SCSI controller.
 
-  Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
-  Adaptec 152x series ISA SCSI controllers
-  Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
-  and SoundBlaster SCSI cards.
-
-  [ Note:  There is work-in-progress to port the AIC-6260/6360 and
-    UltraStor drivers to the new CAM SCSI framework, but no estimates on
-    when or if they will be completed. ]
+  [ Note:  There is work-in-progress to port the UltraStor driver to 
+    the new CAM SCSI framework, but no estimates on when or if it will 
+    be completed. ]
 
 Unmaintained drivers, they might or might not work for your hardware:
 
diff --git a/release/texts/i386/HARDWARE.TXT b/release/texts/i386/HARDWARE.TXT
index 61267f8..123b298 100644
--- a/release/texts/i386/HARDWARE.TXT
+++ b/release/texts/i386/HARDWARE.TXT
@@ -67,7 +67,7 @@ uha0*   330     dyn     6       dyn     Ultrastore 14f
 aha0    330     dyn     5       dyn     Adaptec 154x/1535 SCSI controller
 ahb0    dyn     dyn     dyn     dyn     Adaptec 174x SCSI controller
 ahc0    dyn     dyn     dyn     dyn     Adaptec 274x/284x/294x SCSI controller
-aic0*   340     11      dyn     dyn     Adaptec 152x/AIC-6360 SCSI
+aic0    340     11      dyn     dyn     Adaptec 152x/AIC-6360/AIC-6260 SCSI
                                         controller
 isp0    dyn     dyn     dyn     dyn     QLogic 10X0, 2100 SCSI/FC controllers
 dpt     n/a     n/a     n/a     n/a     DPT RAID SCSI controllers.
@@ -336,6 +336,10 @@ Adaptec 174x series EISA SCSI controller in standard and enhanced mode.
 Adaptec 274X/284X/2920C/294x/2950/3940/3950 (Narrow/Wide/Twin) series
 EISA/VLB/PCI SCSI controllers.
 Adaptec AIC7850, AIC7860, AIC7880, AIC789x, on-board SCSI controllers.
+Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
+Adaptec 152x series ISA SCSI controllers
+Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
+and SoundBlaster SCSI cards.
 
 AdvanSys SCSI controllers (all models).
 
@@ -407,14 +411,9 @@ NOT YET supported under the new CAM SCSI subsystem:
 
   WD7000 SCSI controller.
 
-  Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
-  Adaptec 152x series ISA SCSI controllers
-  Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
-  and SoundBlaster SCSI cards.
-
-  [ Note:  There is work-in-progress to port the AIC-6260/6360 and
-    UltraStor drivers to the new CAM SCSI framework, but no estimates on
-    when or if they will be completed. ]
+  [ Note:  There is work-in-progress to port the UltraStor driver to 
+    the new CAM SCSI framework, but no estimates on when or if it will 
+    be completed. ]
 
 Unmaintained drivers, they might or might not work for your hardware:
 
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index a9630e2..77104ce 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -175,6 +175,10 @@ Adaptec 174x series EISA SCSI controller in standard and enhanced mode.
 Adaptec 274X/284X/2920C/294x/2950/3940/3950 (Narrow/Wide/Twin) series
 EISA/VLB/PCI SCSI controllers.
 Adaptec AIC7850, AIC7860, AIC7880, AIC789x, on-board SCSI controllers.
+Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
+Adaptec 152x series ISA SCSI controllers
+Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
+and SoundBlaster SCSI cards.
 
 AdvanSys SCSI controllers (all models).
 
@@ -247,14 +251,9 @@ NOT YET supported under the new CAM SCSI subsystem:
 
   WD7000 SCSI controller.
 
-  Adaptec 1510 series ISA SCSI controllers (not for bootable devices)
-  Adaptec 152x series ISA SCSI controllers
-  Adaptec AIC-6260 and AIC-6360 based boards, which includes the AHA-152x
-  and SoundBlaster SCSI cards.
-
-  [ Note:  There is work-in-progress to port the AIC-6260/6360 and
-    UltraStor drivers to the new CAM SCSI framework, but no estimates on
-    when or if they will be completed. ]
+  [ Note:  There is work-in-progress to port the UltraStor driver to 
+    the new CAM SCSI framework, but no estimates on when or if it will 
+    be completed. ]
 
 Unmaintained drivers, they might or might not work for your hardware: