Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[deliverable/linux.git] / include / asm-powerpc / types.h

diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h
index d6fb56b80453c44d5ad922d25cfc25060655748c..3b363757a2bbf7370cdcff220becf11313f2fd8f 100644 (file)
--- a/include/asm-powerpc/types.h
+++ b/include/asm-powerpc/types.h
@@ -97,16 +97,6 @@ typedef struct {
        unsigned long env;
 } func_descr_t;
 
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-#define HAVE_SECTOR_T
-#endif
-
-#ifdef CONFIG_LSF
-typedef u64 blkcnt_t;
-#define HAVE_BLKCNT_T
-#endif
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */