Commit f11b7bd8 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras

[PATCH] powerpc: Move naca.h to platforms/iseries

These days, the NACA only exists on iSeries.  Therefore, this patch
moves naca.h from include/asm-ppc64 to arch/powerpc/platforms/iseries.
There was one file including naca.h outside of platforms/iseries -
arch/ppc64/kernel/udbg_scc.c.  However, that's obviously a hangover
from older days.  The include is not necessary, so this patch simply
removes it.

Built and booted on iSeries, built for G5 (which uses udbg_scc.o).
Signed-off-by: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9933f299
......@@ -13,7 +13,6 @@
#include <linux/bitops.h>
#include <asm/processor.h>
#include <asm/ptrace.h>
#include <asm/naca.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/ItLpNaca.h>
#include <asm/lppaca.h>
......@@ -23,6 +22,7 @@
#include <asm/iSeries/ItExtVpdPanel.h>
#include <asm/iSeries/ItLpQueue.h>
#include "naca.h"
#include "vpd_areas.h"
#include "spcomm_area.h"
#include "ipl_parms.h"
......
#ifndef _NACA_H
#define _NACA_H
#ifndef _PLATFORMS_ISERIES_NACA_H
#define _PLATFORMS_ISERIES_NACA_H
/*
* c 2001 PPC 64 Team, IBM Corp
......@@ -21,4 +21,4 @@ struct naca_struct {
extern struct naca_struct naca;
#endif /* _NACA_H */
#endif /* _PLATFORMS_ISERIES_NACA_H */
......@@ -24,7 +24,7 @@
* address of the OS's NACA).
*/
#include <asm/types.h>
#include <asm/naca.h>
#include "naca.h"
/*
* When we IPL a secondary partition, we will check if if the
......
......@@ -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/HvLpEvent.h>
#include <asm/iSeries/LparMap.h>
#include "naca.h"
#include "setup.h"
#include "irq.h"
#include "vpd_areas.h"
......
......@@ -12,7 +12,6 @@
#include <linux/types.h>
#include <asm/udbg.h>
#include <asm/processor.h>
#include <asm/naca.h>
#include <asm/io.h>
#include <asm/prom.h>
#include <asm/pmac_feature.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment