summaryrefslogtreecommitdiffstats
path: root/arch/ppc64
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 18:15:43 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 18:15:43 +1100
commit2be7a906752abf8dce9350c23b6d1036049a5d3e (patch)
treeef178fa5801bdce24938819086662bb747d8c0c2 /arch/ppc64
parentaaf8a7a2949481482200686c7bd3852e5be2e093 (diff)
parentfbf1769d08a8b085834dceb228540153ac2cd534 (diff)
downloadop-kernel-dev-2be7a906752abf8dce9350c23b6d1036049a5d3e.zip
op-kernel-dev-2be7a906752abf8dce9350c23b6d1036049a5d3e.tar.gz
Merge Paulus' tree
Diffstat (limited to 'arch/ppc64')
-rw-r--r--arch/ppc64/kernel/udbg_scc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/udbg_scc.c b/arch/ppc64/kernel/udbg_scc.c
index c47fd6c..820c535 100644
--- a/arch/ppc64/kernel/udbg_scc.c
+++ b/arch/ppc64/kernel/udbg_scc.c
@@ -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>
OpenPOWER on IntegriCloud