projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
[linux-2.6-microblaze.git]
/
include
/
asm-ppc
/
ocp.h
diff --git
a/include/asm-ppc/ocp.h
b/include/asm-ppc/ocp.h
index
16dbc7d
..
3909a2e
100644
(file)
--- a/
include/asm-ppc/ocp.h
+++ b/
include/asm-ppc/ocp.h
@@
-27,11
+27,10
@@
#include <linux/init.h>
#include <linux/list.h>
#include <linux/device.h>
+#include <linux/rwsem.h>
#include <asm/mmu.h>
#include <asm/ocp_ids.h>
-#include <asm/rwsem.h>
-#include <asm/semaphore.h>
#ifdef CONFIG_PPC_OCP