summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/pcmcia_/cs_types.h
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-11-04 08:52:41 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-11-04 08:52:41 +0000
commitb1b7648e3e9bf3d00b1f0ba9abebff1350dd1d8d (patch)
tree9a324c82bdd761ab638114ec7e2f9336fff4e9a5 /mdk-stage1/pcmcia_/cs_types.h
parent16aeec9a73dab5fe22227ddde5aa31f6aa40532a (diff)
downloaddrakx-backup-do-not-use-b1b7648e3e9bf3d00b1f0ba9abebff1350dd1d8d.tar
drakx-backup-do-not-use-b1b7648e3e9bf3d00b1f0ba9abebff1350dd1d8d.tar.gz
drakx-backup-do-not-use-b1b7648e3e9bf3d00b1f0ba9abebff1350dd1d8d.tar.bz2
drakx-backup-do-not-use-b1b7648e3e9bf3d00b1f0ba9abebff1350dd1d8d.tar.xz
drakx-backup-do-not-use-b1b7648e3e9bf3d00b1f0ba9abebff1350dd1d8d.zip
Merge with kernel headers 2.4.22-23mdk. Fix args to SCSI_IOCTL_GET_IDLUN
for 64-bit arches. Some misc arrangements to make sure we have unsigned long instead of plain u_long.
Diffstat (limited to 'mdk-stage1/pcmcia_/cs_types.h')
-rw-r--r--mdk-stage1/pcmcia_/cs_types.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/mdk-stage1/pcmcia_/cs_types.h b/mdk-stage1/pcmcia_/cs_types.h
index a6b56b6bf..4598d7f48 100644
--- a/mdk-stage1/pcmcia_/cs_types.h
+++ b/mdk-stage1/pcmcia_/cs_types.h
@@ -38,8 +38,13 @@
#endif
#endif
-typedef u_short socket_t;
+#ifdef __arm__
+typedef u_int ioaddr_t;
+#else
typedef u_short ioaddr_t;
+#endif
+
+typedef u_short socket_t;
typedef u_int event_t;
typedef u_char cisdata_t;
typedef u_short page_t;