Merge watchdog driver updates

[linux-2.6] / include / asm-ppc / types.h

diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h
index a787bc0325879dbc6e1bf649fbb6ec8b4867aeea..77dc24d7d2ad1910151cb23d48279e7ef3a6abd0 100644 (file)
--- a/include/asm-ppc/types.h
+++ b/include/asm-ppc/types.h
@@ -62,8 +62,6 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */