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_/cardmgr.c | |
| parent | 5591eb1b1a30e2744a1c3bef614efd73008c442d (diff) | |
| download | drakx-backup-do-not-use-7f90603174c35f5d71a738e69790ab00e4ad6397.tar drakx-backup-do-not-use-7f90603174c35f5d71a738e69790ab00e4ad6397.tar.gz drakx-backup-do-not-use-7f90603174c35f5d71a738e69790ab00e4ad6397.tar.bz2 drakx-backup-do-not-use-7f90603174c35f5d71a738e69790ab00e4ad6397.tar.xz drakx-backup-do-not-use-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_/cardmgr.c')
| -rw-r--r-- | mdk-stage1/pcmcia_/cardmgr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/pcmcia_/cardmgr.c b/mdk-stage1/pcmcia_/cardmgr.c index 2891c93a4..f67b02f72 100644 --- a/mdk-stage1/pcmcia_/cardmgr.c +++ b/mdk-stage1/pcmcia_/cardmgr.c @@ -229,7 +229,7 @@ int open_sock(int sock, int mode) static int xlate_scsi_name(bind_info_t *bind) { int i, fd, mode, minor; - u_long arg[2], id1, id2; + u_int arg[2], id1, id2; id1 = strtol(bind->name+3, NULL, 16); if ((bind->major == SCSI_DISK0_MAJOR) || @@ -1259,9 +1259,9 @@ static void adjust_resources(void) if (ret != 0) { switch (al->adj.Resource) { case RES_MEMORY_RANGE: - sprintf(tmp, "memory %p-%p", - (char *)al->adj.resource.memory.Base, - (char *)al->adj.resource.memory.Base + + sprintf(tmp, "memory %#lx-%#lx", + al->adj.resource.memory.Base, + al->adj.resource.memory.Base + al->adj.resource.memory.Size - 1); break; case RES_IO_RANGE: |