14 files changed, 21 insertions, 21 deletions
diff --git a/src/mainboard/msi/ms6119/chip.h b/src/mainboard/msi/ms6119/chip.h
index bcc281fde9..56e17ca594 100644
--- a/src/mainboard/msi/ms6119/chip.h
+++ b/src/mainboard/msi/ms6119/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms6119_ops;
-struct mainboard_msi_ms6119_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/msi/ms6119/mainboard.c b/src/mainboard/msi/ms6119/mainboard.c
index 77ffcb8d64..9c4ef29216 100644
--- a/src/mainboard/msi/ms6119/mainboard.c
+++ b/src/mainboard/msi/ms6119/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_msi_ms6119_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS-6119 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6147/chip.h b/src/mainboard/msi/ms6147/chip.h
index 15ee56d90a..fbf5d32e8c 100644
--- a/src/mainboard/msi/ms6147/chip.h
+++ b/src/mainboard/msi/ms6147/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms6147_ops;
-struct mainboard_msi_ms6147_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/msi/ms6147/mainboard.c b/src/mainboard/msi/ms6147/mainboard.c
index 607a4619f8..b7c7386d3e 100644
--- a/src/mainboard/msi/ms6147/mainboard.c
+++ b/src/mainboard/msi/ms6147/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_msi_ms6147_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS-6147 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6178/chip.h b/src/mainboard/msi/ms6178/chip.h
index 92f8a53226..1e6116e8f8 100644
--- a/src/mainboard/msi/ms6178/chip.h
+++ b/src/mainboard/msi/ms6178/chip.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms6178_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms6178_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c
index 0a5410386d..c3fdd81bbc 100644
--- a/src/mainboard/msi/ms6178/mainboard.c
+++ b/src/mainboard/msi/ms6178/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_msi_ms6178_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS-6178 Mainboard")
 };
diff --git a/src/mainboard/msi/ms7135/chip.h b/src/mainboard/msi/ms7135/chip.h
index 024971bb46..262341df75 100644
--- a/src/mainboard/msi/ms7135/chip.h
+++ b/src/mainboard/msi/ms7135/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms7135_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_ms7135_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/msi/ms7135/mainboard.c b/src/mainboard/msi/ms7135/mainboard.c
index 32784b021e..ac0bace413 100644
--- a/src/mainboard/msi/ms7135/mainboard.c
+++ b/src/mainboard/msi/ms7135/mainboard.c
@@ -22,7 +22,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms7135_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS7135 Mainboard")
 };
 #endif
diff --git a/src/mainboard/msi/ms7260/chip.h b/src/mainboard/msi/ms7260/chip.h
index e1eb800aaf..1e6116e8f8 100644
--- a/src/mainboard/msi/ms7260/chip.h
+++ b/src/mainboard/msi/ms7260/chip.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms7260_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms7260_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c
index 11fabe81a8..a6c6e08d58 100644
--- a/src/mainboard/msi/ms7260/mainboard.c
+++ b/src/mainboard/msi/ms7260/mainboard.c
@@ -22,7 +22,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms7260_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI K9N Neo (MS-7260) Mainboard")
 };
 #endif
diff --git a/src/mainboard/msi/ms9185/chip.h b/src/mainboard/msi/ms9185/chip.h
index 0cef9992da..12d593237e 100644
--- a/src/mainboard/msi/ms9185/chip.h
+++ b/src/mainboard/msi/ms9185/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms9185_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms9185_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };
diff --git a/src/mainboard/msi/ms9185/mainboard.c b/src/mainboard/msi/ms9185/mainboard.c
index 8b995af326..e681d74604 100644
--- a/src/mainboard/msi/ms9185/mainboard.c
+++ b/src/mainboard/msi/ms9185/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms9185_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-9185 Mainboard")
 };
 #endif
diff --git a/src/mainboard/msi/ms9282/chip.h b/src/mainboard/msi/ms9282/chip.h
index d5558d146c..d57f1df7d8 100644
--- a/src/mainboard/msi/ms9282/chip.h
+++ b/src/mainboard/msi/ms9282/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms9282_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms9282_config {
+struct mainboard_config {
        int fixup_scsi;
        int fixup_vga;
 };
diff --git a/src/mainboard/msi/ms9282/mainboard.c b/src/mainboard/msi/ms9282/mainboard.c
index 62a39259b5..91bbffd9ff 100644
--- a/src/mainboard/msi/ms9282/mainboard.c
+++ b/src/mainboard/msi/ms9282/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms9282_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-9282 Mainboard")
 };
 #endif