Merge with /home/shaggy/git/linus-clean/

[karo-tx-linux.git] / include / asm-frv / types.h

diff --git a/include/asm-frv/types.h b/include/asm-frv/types.h
index 50605df6d8acbc024adcba5f4c7aabe1ac57ca14..2560f596a75db78b2e7f406864f281933fff3957 100644 (file)
--- a/include/asm-frv/types.h
+++ b/include/asm-frv/types.h
@@ -59,7 +59,6 @@ typedef unsigned int u32;
 
 typedef signed long long s64;
 typedef unsigned long long u64;
-typedef u64 u_quad_t;
 
 /* Dma addresses are 32-bits wide.  */