diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-03-17 15:47:07 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-03-17 15:47:07 +0000 |
| commit | 7f90603174c35f5d71a738e69790ab00e4ad6397 (patch) | |
| tree | 83080437e7f7c78f9dccc0d7c261424398930486 /mdk-stage1/pcmcia_/cs_types.h | |
| parent | 5591eb1b1a30e2744a1c3bef614efd73008c442d (diff) | |
| download | drakx-7f90603174c35f5d71a738e69790ab00e4ad6397.tar drakx-7f90603174c35f5d71a738e69790ab00e4ad6397.tar.gz drakx-7f90603174c35f5d71a738e69790ab00e4ad6397.tar.bz2 drakx-7f90603174c35f5d71a738e69790ab00e4ad6397.tar.xz drakx-7f90603174c35f5d71a738e69790ab00e4ad6397.zip | |
merge with recent enough kernel and remove osbolete (unused) stuff, also do
some 64-bit fixing there (forward port from cs3 and 10.1 branches)
Diffstat (limited to 'mdk-stage1/pcmcia_/cs_types.h')
| -rw-r--r-- | mdk-stage1/pcmcia_/cs_types.h | 7 |
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; |