git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ata_piix and ahci both claim 8086:2652 and 8086:2653,
[bootmanager.git]
/
source
/
merge_hw_tables.py
diff --git
a/source/merge_hw_tables.py
b/source/merge_hw_tables.py
index
ab0ae5f
..
036d0e6
100755
(executable)
--- a/
source/merge_hw_tables.py
+++ b/
source/merge_hw_tables.py
@@
-129,12
+129,6
@@
def merge_files(modules_dep_path, modules_pcimap_path, pcitable_path):
if module == "mptbase":
module= "mptscsih"
if module == "mptbase":
module= "mptscsih"
- # XXX ata_piix and ahci both claim the same chipsets, and it
- # is usually a non-visible BIOS option that decides which is
- # appropriate. Prefer ata_piix over ahci for now.
- if module == "ahci":
- module= "ata_piix"
-
try:
vendor_id= long(line_parts[1],16)
except ValueError, e:
try:
vendor_id= long(line_parts[1],16)
except ValueError, e: