Merge branch 'from-linus' into upstream

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

diff --git a/include/asm-arm/types.h b/include/asm-arm/types.h
index f4c92e4c8c0219a31b69f8d59367c105d5767fef..22992ee0627ac3fb5c87bfa4c297184b8bfd1628 100644 (file)
--- a/include/asm-arm/types.h
+++ b/include/asm-arm/types.h
@@ -52,8 +52,6 @@ typedef unsigned long long u64;
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */