rebased to origin/master

diff --git a/src/mainboard/asus/m5a99x-evo/mptable.c b/src/mainboard/asus/m5a99x-evo/mptable.c
index 4396a2b6b38a425ca394c810b981a36e2d320f7d..ff50e3acfd8f9b572bb7395c6bc8b11d8af317cd 100644 (file)
--- a/src/mainboard/asus/m5a99x-evo/mptable.c
+++ b/src/mainboard/asus/m5a99x-evo/mptable.c
@@ -52,7 +52,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/m5a99x-evo/rd890_cfg.c b/src/mainboard/asus/m5a99x-evo/rd890_cfg.c
index 9518691abb6d90dccf41f516d64d725db84a2d14..45849b4a59e522d351d5248a69cf71d01347a59f 100644 (file)
--- a/src/mainboard/asus/m5a99x-evo/rd890_cfg.c
+++ b/src/mainboard/asus/m5a99x-evo/rd890_cfg.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <string.h>
 #include "NbPlatform.h"
 #include "rd890_cfg.h"
 #include "northbridge/amd/cimx/rd890/chip.h"
 #include "nbInitializer.h"
-#include <string.h>
 #include <arch/ioapic.h>
 
 #ifndef __PRE_RAM__