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

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

diff --git a/include/asm-xtensa/types.h b/include/asm-xtensa/types.h
index ebac004698520fab778f8a9c2298208a606395e6..9d99a8e9e337101af6fc2bb6881cabc85103915d 100644 (file)
--- a/include/asm-xtensa/types.h
+++ b/include/asm-xtensa/types.h
@@ -58,8 +58,6 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __KERNEL__ */
 #endif