Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

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

diff --git a/include/asm-x86_64/types.h b/include/asm-x86_64/types.h
index 32bd1426b523dec2d2e251a9902295f6f628f023..c86c2e6793e2a87b55224a7d17f9dfa077ae75e3 100644 (file)
--- a/include/asm-x86_64/types.h
+++ b/include/asm-x86_64/types.h
@@ -51,8 +51,6 @@ typedef u64 dma_addr_t;
 typedef u64 sector_t;
 #define HAVE_SECTOR_T
 
-typedef unsigned short kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */