---

yaml --- r: 54597 b: refs/heads/master c: 7c4e95b h: refs/heads/master i: 54595: a9b5916 v: v3
git-mirror · May 8, 2007 · f1cde28 · f1cde28
1 parent 1287f2b
commit f1cde28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b3af29bf33bfe08c604769632799d27d56ae103
+refs/heads/master: 7c4e95bf483231d55bc0d491bc585bb9b7e852b8
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
@@ -1533,7 +1533,7 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
 	struct FIRM_ID __iomem *firm_id;
 	struct ZFW_CTRL __iomem *zfw_ctrl;
 	struct BOARD_CTRL __iomem *board_ctrl;
-	unsigned long __iomem *pci_doorbell;
+	uclong __iomem *pci_doorbell;
 	int index;
 
 	firm_id = cinfo->base_addr + ID_ADDRESS;

diff --git a/trunk/include/linux/cyclades.h b/trunk/include/linux/cyclades.h
@@ -149,14 +149,12 @@ struct CYZ_BOOT_CTRL {
  *	architectures and compilers.
  */
 
-#if defined(__alpha__)
-typedef unsigned long	ucdouble;	/* 64 bits, unsigned */
-typedef unsigned int	uclong;		/* 32 bits, unsigned */
-#else
-typedef unsigned long	uclong;		/* 32 bits, unsigned */
-#endif
-typedef unsigned short	ucshort;	/* 16 bits, unsigned */
-typedef unsigned char	ucchar;		/* 8 bits, unsigned */
+#include <asm/types.h>
+
+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