X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fmerge_hw_tables.py;h=036d0e6b20f6ff71758456e5aea474a72c57b0ff;hb=694c9c9272fd30cc7016f31c1562ed2d56ac234c;hp=904847cf9338ab2f9aaf33b4b3ae287a04d4436e;hpb=0773644c609430f3f5c23deeac56d121123ec8ed;p=bootmanager.git

diff --git a/source/merge_hw_tables.py b/source/merge_hw_tables.py
index 904847c..036d0e6 100755
--- a/source/merge_hw_tables.py
+++ b/source/merge_hw_tables.py
@@ -1,4 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
+
+# Copyright (c) 2003 Intel Corporation
+# All rights reserved.
+#
+# Copyright (c) 2004-2006 The Trustees of Princeton University
+# All rights reserved.
+
 
 """
 The point of this small utility is to take a file in the format
@@ -117,6 +124,11 @@ def merge_files(modules_dep_path, modules_pcimap_path, pcitable_path):
         # first two parts are always vendor / device id
         module= line_parts[0]
 
+        # XXX In kernel versions <2.6.14, mptscsih is the actual
+        # module that should be loaded instead of mptbase.
+        if module == "mptbase":
+            module= "mptscsih"
+
         try:
             vendor_id= long(line_parts[1],16)
         except ValueError, e: