Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[linux-2.6-omap-h63xx.git] / include / asm-ppc / ocp.h

diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h
index 983116f59d909f0e802c6f19c30a5d5a9a974e82..1379a4f76de3bf51af5273949dfb5c96e4f6a82b 100644 (file)
--- a/include/asm-ppc/ocp.h
+++ b/include/asm-ppc/ocp.h
@@ -26,13 +26,11 @@
 
 #include <linux/init.h>
 #include <linux/list.h>
-#include <linux/config.h>
-#include <linux/devfs_fs_kernel.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