Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[~andy/linux] / include / asm-x86_64 / types.h

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