Merge Paulus' tree

2005-11-02 18:15:43 +11:00
parent aaf8a7a294 fbf1769d08
commit 2be7a90675
252 changed files with 4361 additions and 1404 deletions
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -41,7 +41,6 @@
 #include <asm/firmware.h>

 #include <asm/time.h>
-#include <asm/naca.h>
 #include <asm/paca.h>
 #include <asm/cache.h>
 #include <asm/sections.h>
@@ -54,6 +53,7 @@
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/lpar_map.h>

+#include "naca.h"
 #include "setup.h"
 #include "irq.h"
 #include "vpd_areas.h"