fix up sb600 and it8712f tree.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5449 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/southbridge/amd/sb600/sb600_early_setup.c b/src/southbridge/amd/sb600/sb600_early_setup.c
index dd2ed69cd2ff3402a41ad0774e2fdbce3dd6a77a..274eda002ffcbda4b90687a6728953d53697a794 100644 (file)
--- a/src/southbridge/amd/sb600/sb600_early_setup.c
+++ b/src/southbridge/amd/sb600/sb600_early_setup.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <reset.h>
 #include <arch/cpu.h>
 #include "sb600.h"
 #include "sb600_smbus.c"
@@ -196,7 +197,7 @@ static void enable_fid_change_on_sb(u32 sbbusn, u32 sbdn)
 }
 
 
-static void hard_reset(void)
+void hard_reset(void)
 {
        set_bios_reset();
 
@@ -205,14 +206,13 @@ static void hard_reset(void)
        outb(0x0e, 0x0cf9);
 }
 
-static void soft_reset(void)
+void soft_reset(void)
 {
        set_bios_reset();
        /* link reset */
        outb(0x06, 0x0cf9);
 }
 
-
 static void sb600_pci_port80(void)
 {
        u8 byte;

diff --git a/src/superio/ite/it8712f/it8712f.h b/src/superio/ite/it8712f/it8712f.h
index 884d77e58286eca4f42e099a4b3143a1f8f75569..60c7413b3ea07f2d738fc625fc1ea5e33e8c09d5 100644 (file)
--- a/src/superio/ite/it8712f/it8712f.h
+++ b/src/superio/ite/it8712f/it8712f.h
@@ -36,6 +36,6 @@
 #ifndef __ROMCC__
 void it8712f_kill_watchdog(void);
 void it8712f_enable_serial(device_t dev, unsigned iobase);
-void it8712f_24mhz_clkin(void)
-void it8712f_enable_3vsbsw(void)
+void it8712f_24mhz_clkin(void);
+void it8712f_enable_3vsbsw(void);
 #endif

diff --git a/src/superio/ite/it8712f/it8712f_early_serial.c b/src/superio/ite/it8712f/it8712f_early_serial.c
index a243202982f2aeea917e21a7647bf0a30e20f1c4..76f9bc0d078a496f3736f9e128eee96b5af1ebac 100644 (file)
--- a/src/superio/ite/it8712f/it8712f_early_serial.c
+++ b/src/superio/ite/it8712f/it8712f_early_serial.c
@@ -91,7 +91,7 @@ void it8712f_enable_3vsbsw(void)
        it8712f_exit_conf();
 }
 
-static void it8712f_kill_watchdog(void)
+void it8712f_kill_watchdog(void)
 {
        it8712f_enter_conf();