From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 29 Jun 2006 16:05:54 +0000 (+0000)
Subject: - In kernel versions <2.6.14, mptscsih is the actual module that should
X-Git-Tag: myplc-0_4-rc1~1
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=e39528f43a41731eaa04321a9f0160079fced818

- In kernel versions <2.6.14, mptscsih is the actual module that should
  be loaded instead of mptbase
---

diff --git a/source/merge_hw_tables.py b/source/merge_hw_tables.py
index 904847c..9d850d2 100755
--- a/source/merge_hw_tables.py
+++ b/source/merge_hw_tables.py
@@ -117,6 +117,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: