summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/pcmcia_/cardmgr.c
diff options
context:
space:
mode:
authorMystery Man <unknown@mandriva.org>2003-11-21 12:53:39 +0000
committerMystery Man <unknown@mandriva.org>2003-11-21 12:53:39 +0000
commit7396369ef190a049b3a779a54edd76ff118f3c28 (patch)
tree20c2a6d7fcd96433d0d91b1460b5604a6d7267ce /mdk-stage1/pcmcia_/cardmgr.c
parente41742b093fdb26bcae87e9d5b30d4d7bca93ea9 (diff)
downloaddrakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar
drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar.gz
drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar.bz2
drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar.xz
drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.zip
This commit was manufactured by cvs2svn to create tag 'MDK92-AMD64'.MDK92-AMD64
Diffstat (limited to 'mdk-stage1/pcmcia_/cardmgr.c')
-rw-r--r--mdk-stage1/pcmcia_/cardmgr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/pcmcia_/cardmgr.c b/mdk-stage1/pcmcia_/cardmgr.c
index ea3ff127e..042aa9e5d 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: