Disconnected operation.

[bootmanager.git] / source / merge_hw_tables.py

diff --git a/source/merge_hw_tables.py b/source/merge_hw_tables.py
index ab0ae5f..dfe3378 100755 (executable)
--- a/source/merge_hw_tables.py
+++ b/source/merge_hw_tables.py
@@ -50,6 +50,7 @@ cciss 0e11:b060 0e11:b178
 
 import os, sys
 import string
+import StringIO
 
 PCI_ANY = 0xffffffffL
 
@@ -79,7 +80,7 @@ def merge_files(modules_dep_path, modules_pcimap_path, pcitable_path):
     except IOError:
         sys.stderr.write( "Unable to open pcitable: %s\n" %
                           pcitable_path )
-        return
+       pcitable_file=StringIO.StringIO()
 
     # associative array to store all matches of module -> ['vendor:device',..]
     # entries
@@ -129,12 +130,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: