diff options
| -rw-r--r-- | drivers/char/cyclades.c | 2 | ||||
| -rw-r--r-- | include/linux/cyclades.h | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 16dc5d1d3cb..7f73bff0c81 100644 --- a/drivers/char/cyclades.c +++ b/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/include/linux/cyclades.h b/include/linux/cyclades.h index 46d8254c1a7..a6865f0479f 100644 --- a/include/linux/cyclades.h +++ b/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 |