X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fmerge_hw_tables.py;h=036d0e6b20f6ff71758456e5aea474a72c57b0ff;hb=aa2c57dfa6c4a96192f77776dc006d8405ef0d8c;hp=ab0ae5f7ae138a944cbaf8777f1fcb9399ea561a;hpb=6ff7465d1b582b171ebf6d34b1f43c1b98cdacb8;p=bootmanager.git diff --git a/source/merge_hw_tables.py b/source/merge_hw_tables.py index ab0ae5f..036d0e6 100755 --- 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" - # 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: