Really merged with trunk this time, I think for sure maybe.

git-svn-id: svn://openib.tc.cornell.edu/gen1@12 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/fab_cm_branch/inc/ics_ver.h b/branches/fab_cm_branch/inc/ics_ver.h
index 416fa59f1fa5b4f17d17417230407704ac1062f1..d925eb3b3c4b48de716daeb5a44edc76f70e33ba 100644 (file)
--- a/branches/fab_cm_branch/inc/ics_ver.h
+++ b/branches/fab_cm_branch/inc/ics_ver.h
@@ -76,11 +76,11 @@
 #ifdef VER_COMPANYNAME_STR\r
 #undef VER_COMPANYNAME_STR\r
 #endif\r
-#define VER_COMPANYNAME_STR            "SilverStorm Technologies, Inc."\r
+#define VER_COMPANYNAME_STR            "SilverStorm Technologies"\r
 \r
 #ifdef VER_PRODUCTNAME_STR\r
 #undef VER_PRODUCTNAME_STR\r
 #endif\r
-#define VER_PRODUCTNAME_STR            "InfiniServ 7000"\r
+#define VER_PRODUCTNAME_STR            "SilverStorm HCA 7000/9000"\r
 \r
-#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2004 SilverStorm Technologies, Inc."\r
+#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2005 SilverStorm Technologies"\r

diff --git a/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp b/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp
index eb7b45f23856644eebec9ef1ec0f4bad09ad251a..d6cd7bea60ab6af962c67825714eea11f2484efa 100644 (file)
--- a/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp
+++ b/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp
@@ -2079,7 +2079,7 @@ bool burnImageToFlash(FlashCommandLine cl)
                 printf("The image on the flash device appears corrupted!\n"  \r
                        "Unable to determine the GUIDs from the flash device %s.\n"\r
                        "Try the -n <0xGUID> option.  If this fails, then contact\n" \r
-                       "SilverStorm Technologies, Inc. technical support.\n",\r
+                       "SilverStorm Technologies technical support.\n",\r
                        cl.getDeviceName());\r
                 device.close();\r
                 return false;\r
@@ -2296,7 +2296,7 @@ bool showInfo(FBase &device, FlashCommandLine cl)
         {\r
             printf("Hardware Version  : 0x%"PRIX32"\n", hardwareversion);\r
         }\r
-        printf("Company           : %s\n",  ps.vsd[0]==0x00066A?"SilverStorm Technologies, Inc.":"Mellanox, Inc");\r
+        printf("Company           : %s\n",  ps.vsd[0]==0x00066A?"SilverStorm Technologies":"Mellanox, Inc");\r
 \r
                myTime = ps.vsd[2];\r
         printf("%s Date     : %s", (device.getClassType()==Flash::FlashDeviceType?"Burn    ":"Creation"), asctime(localtime(&myTime))); \r