diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:28 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:28 -0400 |
commit | b6cd7da5be2522b62bbc48d41b36c828b88e02fe (patch) | |
tree | 9c6089a431dfb7cd1539413656d343454607fdbe /include/asm-mips | |
parent | dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394 (diff) |
ide-generic: remove "no_pci_devices()" quirk from ide_default_io_base()
Since the decision to probe for ISA ide2-6 is now left to the user
"no_pci_devices()" quirk is no longer needed and may be removed.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/mach-generic/ide.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index 71a01c5aec16..f34740ee6775 100644 --- a/include/asm-mips/mach-generic/ide.h +++ b/include/asm-mips/mach-generic/ide.h | |||
@@ -72,23 +72,13 @@ static __inline__ int ide_default_irq(unsigned long base) | |||
72 | 72 | ||
73 | static __inline__ unsigned long ide_default_io_base(int index) | 73 | static __inline__ unsigned long ide_default_io_base(int index) |
74 | { | 74 | { |
75 | /* | ||
76 | * If PCI is present then it is not safe to poke around | ||
77 | * the other legacy IDE ports. Only 0x1f0 and 0x170 are | ||
78 | * defined compatibility mode ports for PCI. A user can | ||
79 | * override this using ide= but we must default safe. | ||
80 | */ | ||
81 | if (no_pci_devices()) { | ||
82 | switch (index) { | ||
83 | case 2: return 0x1e8; | ||
84 | case 3: return 0x168; | ||
85 | case 4: return 0x1e0; | ||
86 | case 5: return 0x160; | ||
87 | } | ||
88 | } | ||
89 | switch (index) { | 75 | switch (index) { |
90 | case 0: return 0x1f0; | 76 | case 0: return 0x1f0; |
91 | case 1: return 0x170; | 77 | case 1: return 0x170; |
78 | case 2: return 0x1e8; | ||
79 | case 3: return 0x168; | ||
80 | case 4: return 0x1e0; | ||
81 | case 5: return 0x160; | ||
92 | default: | 82 | default: |
93 | return 0; | 83 | return 0; |
94 | } | 84 | } |