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 branch 'linux-2.6' into for-2.6.22
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
kernel
/
ppc_ksyms.c
diff --git
a/arch/powerpc/kernel/ppc_ksyms.c
b/arch/powerpc/kernel/ppc_ksyms.c
index 2f8e9c02c92a7142ea43e76f850c09807165624f..ff252aaead122edd17354a3b4716223eea2fecba 100644
(file)
--- a/
arch/powerpc/kernel/ppc_ksyms.c
+++ b/
arch/powerpc/kernel/ppc_ksyms.c
@@
-20,7
+20,6
@@
#include <asm/processor.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <asm/ide.h>
#include <asm/atomic.h>
#include <asm/checksum.h>
#include <asm/pgtable.h>
#include <asm/atomic.h>
#include <asm/checksum.h>
#include <asm/pgtable.h>