git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] merge some from Rusty's trivial patches
[sfrench/cifs-2.6.git]
/
arch
/
ppc
/
kernel
/
cpu_setup_6xx.S
diff --git
a/arch/ppc/kernel/cpu_setup_6xx.S
b/arch/ppc/kernel/cpu_setup_6xx.S
index 1f37b7eafac215b912a965f1ee9cada8e714abeb..ba396438ede34ff1c7b555f95b7c1dee9e3429d3 100644
(file)
--- a/
arch/ppc/kernel/cpu_setup_6xx.S
+++ b/
arch/ppc/kernel/cpu_setup_6xx.S
@@
-12,7
+12,6
@@
#include <linux/config.h>
#include <asm/processor.h>
#include <asm/page.h>
-#include <asm/ppc_asm.h>
#include <asm/cputable.h>
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>