From: viro@parcelfarce.linux.theplanet.co.uk
---
drivers/block/paride/bpck6.c | 2 +-
drivers/block/paride/frpw.c | 2 +-
drivers/block/paride/paride.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/block/paride/bpck6.c~PI24-paride64-RC1 drivers/block/paride/bpck6.c
--- 25/drivers/block/paride/bpck6.c~PI24-paride64-RC1 2004-01-15 00:22:46.000000000 -0800
+++ 25-akpm/drivers/block/paride/bpck6.c 2004-01-15 00:22:46.000000000 -0800
@@ -228,7 +228,7 @@ static int bpck6_init_proto(PIA *pi)
if (p) {
memset(p, 0, sizeof(PPC));
- pi->private = (int)p;
+ pi->private = (unsigned long)p;
return 0;
}
diff -puN drivers/block/paride/frpw.c~PI24-paride64-RC1 drivers/block/paride/frpw.c
--- 25/drivers/block/paride/frpw.c~PI24-paride64-RC1 2004-01-15 00:22:46.000000000 -0800
+++ 25-akpm/drivers/block/paride/frpw.c 2004-01-15 00:22:46.000000000 -0800
@@ -261,7 +261,7 @@ static int frpw_test_proto( PIA *pi, cha
frpw_disconnect(pi);
if (verbose) {
- printk("%s: frpw: port 0x%x, chip %d, mode %d, test=(%d,%d,%d)\n",
+ printk("%s: frpw: port 0x%x, chip %ld, mode %d, test=(%d,%d,%d)\n",
pi->device,pi->port,(pi->private%2),pi->mode,e[0],e[1],r);
}
diff -puN drivers/block/paride/paride.h~PI24-paride64-RC1 drivers/block/paride/paride.h
--- 25/drivers/block/paride/paride.h~PI24-paride64-RC1 2004-01-15 00:22:46.000000000 -0800
+++ 25-akpm/drivers/block/paride/paride.h 2004-01-15 00:22:46.000000000 -0800
@@ -45,7 +45,7 @@ struct pi_adapter {
int saved_r0; /* saved port state */
int saved_r2; /* saved port state */
int reserved; /* number of ports reserved */
- int private; /* for protocol module */
+ unsigned long private; /* for protocol module */
wait_queue_head_t parq; /* semaphore for parport sharing */
void *pardev; /* pointer to pardevice */
_