git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull release into acpica branch
[pandora-kernel.git]
/
include
/
asm-ppc
/
ocp.h
diff --git
a/include/asm-ppc/ocp.h
b/include/asm-ppc/ocp.h
index
c726f18
..
983116f
100644
(file)
--- a/
include/asm-ppc/ocp.h
+++ b/
include/asm-ppc/ocp.h
@@
-202,10
+202,6
@@
static DEVICE_ATTR(name##_##field, S_IRUGO, show_##name##_##field, NULL);
#include <asm/ibm_ocp.h>
#endif
-#ifdef CONFIG_FSL_OCP
-#include <asm/fsl_ocp.h>
-#endif
-
#endif /* CONFIG_PPC_OCP */
#endif /* __OCP_H__ */
#endif /* __KERNEL__ */