summaryrefslogtreecommitdiffstats
path: root/Documentation/parport.txt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
commit95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree27a92a942821cde1edda9a1b088718d436b3efe4 /Documentation/parport.txt
parent45b27b0a0652331d104c953a5b192d843fff88f8 (diff)
Merge with Linux 2.3.40.
Diffstat (limited to 'Documentation/parport.txt')
-rw-r--r--Documentation/parport.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/parport.txt b/Documentation/parport.txt
index 4a0a25e49..b4d7ff895 100644
--- a/Documentation/parport.txt
+++ b/Documentation/parport.txt
@@ -28,8 +28,12 @@ architecture-dependent code with (for example):
to tell the parport code that you want three PC-style ports, one at
0x3bc with no IRQ, one at 0x378 using IRQ 7, and one at 0x278 with an
-auto-detected IRQ. Currently, PC-style (parport_pc), Sun Ultra/AX
-(parport_ax), Amiga, Atari, and MFC3 hardware is supported.
+auto-detected IRQ. Currently, PC-style (parport_pc), Sun `bpp',
+Amiga, Atari, and MFC3 hardware is supported.
+
+PCI parallel I/O card support comes from parport_pc. Base I/O
+addresses should not be specified for supported PCI cards since they
+are automatically detected.
KMod