Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...

[linux-2.6-omap-h63xx.git] / include / asm-m68k / types.h

diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h
index f391cbe39b965c68c9fcfdc1301ccc31c21ba897..b5a1febc97d41d2658d6d25552d788ed3f1ce6ca 100644 (file)
--- a/include/asm-m68k/types.h
+++ b/include/asm-m68k/types.h
@@ -60,8 +60,6 @@ typedef unsigned long long u64;
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */