aboutsummaryrefslogtreecommitdiff
path: root/include/asm-i386/ide.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 19:57:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 19:57:25 -0800
commit3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (patch)
tree2465db413b527b65f2000aa7aa33d0f962ca3479 /include/asm-i386/ide.h
parentb01a55a865eeac0371f1a73d36b134d23d938e1a (diff)
parent07203f6471a11f4eda48acbe528c0ce4704ad42c (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'include/asm-i386/ide.h')
-rw-r--r--include/asm-i386/ide.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 79dfab87135..454440193ea 100644
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -41,6 +41,12 @@ static __inline__ int ide_default_irq(unsigned long base)
static __inline__ unsigned long ide_default_io_base(int index)
{
+ /*
+ * If PCI is present then it is not safe to poke around
+ * the other legacy IDE ports. Only 0x1f0 and 0x170 are
+ * defined compatibility mode ports for PCI. A user can
+ * override this using ide= but we must default safe.
+ */
if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
switch(index) {
case 2: return 0x1e8;