diff --git a/[refs] b/[refs]
index becfe43fcb2a..6e3e8f0d1a4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2693f485c22d18474c077f12fd0f797ee8679b33
+refs/heads/master: 08a951e1693e324bd035b194002a82b9057fd9c5
diff --git a/trunk/include/linux/cyclades.h b/trunk/include/linux/cyclades.h
index a14fe3079761..1fbdea4f08eb 100644
--- a/trunk/include/linux/cyclades.h
+++ b/trunk/include/linux/cyclades.h
@@ -142,19 +142,6 @@ struct CYZ_BOOT_CTRL {
 
 
 #ifndef DP_WINDOW_SIZE
-/* #include "cyclomz.h" */
-/****************** ****************** *******************/
-/*
- *	The data types defined below are used in all ZFIRM interface
- *	data structures. They accomodate differences between HW
- *	architectures and compilers.
- */
-
-typedef __u64  ucdouble;		/* 64 bits, unsigned */
-typedef __u32  uclong;			/* 32 bits, unsigned */
-typedef __u16  ucshort;		/* 16 bits, unsigned */
-typedef __u8   ucchar;			/* 8 bits, unsigned */
-
 /*
  *	Memory Window Sizes
  */