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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-2.6.git]
/
include
/
asm-ppc
/
mpc85xx.h
diff --git
a/include/asm-ppc/mpc85xx.h
b/include/asm-ppc/mpc85xx.h
index 4f844ebe7669ef760a57be715cde6783d4f27389..9b4851199c769c3b3553657cc8f0bef22ae331e3 100644
(file)
--- a/
include/asm-ppc/mpc85xx.h
+++ b/
include/asm-ppc/mpc85xx.h
@@
-17,7
+17,6
@@
#ifndef __ASM_MPC85xx_H__
#define __ASM_MPC85xx_H__
-#include <linux/config.h>
#include <asm/mmu.h>
#ifdef CONFIG_85xx