11 files changed, 19 insertions, 21 deletions

diff --git a/src/mainboard/Iwill/DK8S2/chip.h b/src/mainboard/Iwill/DK8S2/chip.h
index 9836e2dfa9..ba52d6dbdb 100644
--- a/src/mainboard/Iwill/DK8S2/chip.h
+++ b/src/mainboard/Iwill/DK8S2/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_arima_hdama_control;
+extern struct chip_control mainboard_arima_hdama_control;
 
 struct mainboard_arima_hdama_config {
 	int nothing;
diff --git a/src/mainboard/Iwill/DK8X/chip.h b/src/mainboard/Iwill/DK8X/chip.h
index 9836e2dfa9..ba52d6dbdb 100644
--- a/src/mainboard/Iwill/DK8X/chip.h
+++ b/src/mainboard/Iwill/DK8X/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_arima_hdama_control;
+extern struct chip_control mainboard_arima_hdama_control;
 
 struct mainboard_arima_hdama_config {
 	int nothing;
diff --git a/src/mainboard/amd/quartet/chip.h b/src/mainboard/amd/quartet/chip.h
index 191eb65e5c..6f46dd00b4 100644
--- a/src/mainboard/amd/quartet/chip.h
+++ b/src/mainboard/amd/quartet/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_amd_quartet_control;
+extern struct chip_control mainboard_amd_quartet_control;
 
 struct mainboard_amd_quartet_config {
 	int nothing;
diff --git a/src/mainboard/amd/solo/chip.h b/src/mainboard/amd/solo/chip.h
index e25cfac762..5a72960b28 100644
--- a/src/mainboard/amd/solo/chip.h
+++ b/src/mainboard/amd/solo/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_amd_solo_control;
+extern struct chip_control mainboard_amd_solo_control;
 
 struct mainboard_amd_solo_config {
 	int nothing;
diff --git a/src/mainboard/arima/hdama/chip.h b/src/mainboard/arima/hdama/chip.h
index 9836e2dfa9..ba52d6dbdb 100644
--- a/src/mainboard/arima/hdama/chip.h
+++ b/src/mainboard/arima/hdama/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_arima_hdama_control;
+extern struct chip_control mainboard_arima_hdama_control;
 
 struct mainboard_arima_hdama_config {
 	int nothing;
diff --git a/src/mainboard/ibm/e325/chip.h b/src/mainboard/ibm/e325/chip.h
index bc12660679..6aa44a4229 100644
--- a/src/mainboard/ibm/e325/chip.h
+++ b/src/mainboard/ibm/e325/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_ibm_e325_control;
+extern struct chip_control mainboard_ibm_e325_control;
 
 struct mainboard_ibm_e325_config {
 	int nothing;
diff --git a/src/mainboard/newisys/khepri/chip.h b/src/mainboard/newisys/khepri/chip.h
index 44fefaf2d8..7e8ef5210a 100644
--- a/src/mainboard/newisys/khepri/chip.h
+++ b/src/mainboard/newisys/khepri/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_newisys_khepri_control;
+extern struct chip_control mainboard_newisys_khepri_control;
 
 struct mainboard_newisys_khepri_config {
 	int nothing;
diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb
index 33fffe6b48..649259f1f2 100644
--- a/src/mainboard/tyan/s2885/Config.lb
+++ b/src/mainboard/tyan/s2885/Config.lb
@@ -39,7 +39,7 @@ driver mainboard.o
 #dir /drivers/si/3114
 #dir /drivers/intel/82551
 driver ti_firewire.o
-#object reset.o
+
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
 #
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index b3e7c83cc9..559f5b450e 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -6,11 +6,12 @@
 #include <device/pci_ops.h>
 #include "../../../northbridge/amd/amdk8/northbridge.h"
 #include "chip.h"
-//#include <part/mainboard.h>
+
 unsigned long initial_apicid[CONFIG_MAX_CPUS] =
 {
 	0,1
 };
+
 #if 0
 static void fixup_lsi_53c1030(struct device *pdev)
 {
@@ -36,7 +37,7 @@ static void fixup_lsi_53c1030(struct device *pdev)
 	
 }
 #endif
-//extern static void lsi_scsi_init(struct device *dev);
+
 #if 0
 static void print_pci_regs(struct device *dev)
 {
@@ -165,12 +166,7 @@ enable(struct chip *chip, enum chip_pass pass)
 	}
 
 }
-void final_mainboard_fixup(void)
-{
-#if 0
-        enable_ide_devices();
-#endif
-}
+
 static struct device_operations mainboard_operations = {
         .read_resources   = root_dev_read_resources,
         .set_resources    = root_dev_set_resources,
@@ -183,15 +179,17 @@ static struct device_operations mainboard_operations = {
 static void enumerate(struct chip *chip)
 {
         struct chip *child;
+
+	/* update device operation for dynamic root */
         dev_root.ops = &mainboard_operations;
         chip->dev = &dev_root;
         chip->bus = 0;
-        for(child = chip->children; child; child = child->next) {
-                child->bus = &dev_root.link[0];
+        for (child = chip->children; child; child = child->next) {
+		child->bus = &dev_root.link[0];
         }
 }
 struct chip_control mainboard_tyan_s2885_control = {
-	.enable = enable,
+	.enable    = enable,
         .enumerate = enumerate,
         .name      = "Tyan s2885 mainboard ",
 };
diff --git a/src/mainboard/via/epia-m/chip.h b/src/mainboard/via/epia-m/chip.h
index 922b4c44ff..03b13482e2 100644
--- a/src/mainboard/via/epia-m/chip.h
+++ b/src/mainboard/via/epia-m/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_via_epia_m_control;
+extern struct chip_control mainboard_via_epia_m_control;
 
 struct mainboard_via_epia_m_config {
 	int nothing;
diff --git a/src/mainboard/via/epia/chip.h b/src/mainboard/via/epia/chip.h
index 94b632b5a8..2e2f298eb9 100644
--- a/src/mainboard/via/epia/chip.h
+++ b/src/mainboard/via/epia/chip.h
@@ -1,4 +1,4 @@
-struct chip_control mainboard_via_epia_control;
+extern struct chip_control mainboard_via_epia_control;
 
 struct mainboard_via_epia_config {
 	int nothing;