Carl-Daniel's part:

This patch converts mainboard_$VENDOR_$BOARD_ops to mainboard_ops and 
mainboard_$VENDOR_$BOARD_config to mainboard_config.

Ron's part:
The config change that makes the naming change not break every build.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3954 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 9 insertions, 9 deletions

diff --git a/src/mainboard/iwill/dk8_htx/chip.h b/src/mainboard/iwill/dk8_htx/chip.h
index 6d6e90c515..71df35413f 100644
--- a/src/mainboard/iwill/dk8_htx/chip.h
+++ b/src/mainboard/iwill/dk8_htx/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_iwill_dk8_htx_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iwill_dk8_htx_config {
+struct mainboard_config {
 //	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index 01cbe494a8..484290bd12 100644
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_iwill_dk8_htx_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("IWILL DK8-HTX Mainboard")
 };
 #endif
diff --git a/src/mainboard/iwill/dk8s2/chip.h b/src/mainboard/iwill/dk8s2/chip.h
index af9438c913..e168812d0e 100644
--- a/src/mainboard/iwill/dk8s2/chip.h
+++ b/src/mainboard/iwill/dk8s2/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_iwill_dk8s2_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iwill_dk8s2_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index b51ef18bad..7559da63c0 100644
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iwill_dk8s2_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("IWILL DK8S2 Mainboard")
 };
 
diff --git a/src/mainboard/iwill/dk8x/chip.h b/src/mainboard/iwill/dk8x/chip.h
index 4057cfa204..e168812d0e 100644
--- a/src/mainboard/iwill/dk8x/chip.h
+++ b/src/mainboard/iwill/dk8x/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_iwill_dk8x_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iwill_dk8x_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/iwill/dk8x/mainboard.c b/src/mainboard/iwill/dk8x/mainboard.c
index 18cb2b5b4f..a936f4032b 100644
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iwill_dk8x_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("IWILL DK8X Mainboard")
 };