projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
include
/
asm-powerpc
/
iseries
/
iseries_io.h
diff --git
a/include/asm-powerpc/iseries/iseries_io.h
b/include/asm-powerpc/iseries/iseries_io.h
index
496aa85
..
f29009b
100644
(file)
--- a/
include/asm-powerpc/iseries/iseries_io.h
+++ b/
include/asm-powerpc/iseries/iseries_io.h
@@
-1,7
+1,6
@@
#ifndef _ASM_POWERPC_ISERIES_ISERIES_IO_H
#define _ASM_POWERPC_ISERIES_ISERIES_IO_H
#ifndef _ASM_POWERPC_ISERIES_ISERIES_IO_H
#define _ASM_POWERPC_ISERIES_ISERIES_IO_H
-#include <linux/config.h>
#ifdef CONFIG_PPC_ISERIES
#include <linux/types.h>
#ifdef CONFIG_PPC_ISERIES
#include <linux/types.h>