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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
asm-ppc
/
ocp.h
diff --git
a/include/asm-ppc/ocp.h
b/include/asm-ppc/ocp.h
index
1379a4f
..
3909a2e
100644
(file)
--- a/
include/asm-ppc/ocp.h
+++ b/
include/asm-ppc/ocp.h
@@
-31,7
+31,6
@@
#include <asm/mmu.h>
#include <asm/ocp_ids.h>
-#include <asm/semaphore.h>
#ifdef CONFIG_PPC_OCP