summaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
commit545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch)
treee9ce4bc598d06374bda906f18365984bf22a526a /drivers/pnp
parent4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff)
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/parport_probe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/parport_probe.c b/drivers/pnp/parport_probe.c
index 7ffde6f53..85f89e4c7 100644
--- a/drivers/pnp/parport_probe.c
+++ b/drivers/pnp/parport_probe.c
@@ -1,4 +1,4 @@
-/* $Id: parport_probe.c,v 1.2 1997/07/29 03:59:29 ralf Exp $
+/* $Id: parport_probe.c,v 1.3 1997/08/06 19:15:53 miguel Exp $
* Parallel port device probing code
*
* Authors: Carsten Gross, carsten@sol.wohnheim.uni-ulm.de
@@ -52,7 +52,7 @@ static long read_polled(struct parport *port, char *buf,
{
int i;
char *temp=buf;
- int count = 0;
+ unsigned int count = 0;
unsigned char z=0;
unsigned char Byte=0;