Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / mainboard / technexion / tim8690 / mainboard.c

diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c
index 11deef2ad4a82e4829268aacb67e688bd527c5a0..664372d8792df15dc7420d825833415fc851d783 100644 (file)
--- a/src/mainboard/technexion/tim8690/mainboard.c
+++ b/src/mainboard/technexion/tim8690/mainboard.c
@@ -21,11 +21,11 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <arch/io.h>
-#include <boot/coreboot_tables.h>
+#include <boot/tables.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include <southbridge/amd/sb600/sb600.h>
 #include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
@@ -35,8 +35,6 @@
 extern int do_smbus_read_byte(u32 smbus_io_base, u32 device, u32 address);
 extern int do_smbus_write_byte(u32 smbus_io_base, u32 device, u32 address,
                               u8 val);
-extern void lb_add_memory_range(struct lb_memory *mem, uint32_t type,
-                               uint64_t start, uint64_t size);
 #define ADT7461_read_byte(address) \
        do_smbus_read_byte(SMBUS_IO_BASE, ADT7461_ADDRESS, address)
 #define ARA_read_byte(address) \
@@ -50,7 +48,7 @@ uint64_t uma_memory_base, uma_memory_size;
 
 /***************************************************
 * This board, the TIM-8690 has two Marvel 88e5056 PCI-E
-* 10/100/1000 chips on board. 
+* 10/100/1000 chips on board.
 * Both of their pin PERSTn pins are connected to GPIO 5 of the
 * SB600 southbridge.
 ****************************************************/
@@ -145,11 +143,8 @@ static void set_thermal_config(void)
 * enable the dedicated function in tim8690 board.
 * This function called early than rs690_enable.
 *************************************************/
-void tim8690_enable(device_t dev)
+static void tim8690_enable(device_t dev)
 {
-       struct mainboard_config *mainboard =
-           (struct mainboard_config *)dev->chip_info;
-
        printk(BIOS_INFO, "Mainboard tim8690 Enable. dev=0x%p\n", dev);
 
 #if (CONFIG_GFXUMA == 1)
@@ -208,6 +203,7 @@ int add_mainboard_resources(struct lb_memory *mem)
        lb_add_memory_range(mem, LB_MEM_RESERVED,
                uma_memory_base, uma_memory_size);
 #endif
+       return 0;
 }
 
 struct chip_operations mainboard_ops = {