Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
into ppc970.osdl.org:/home/torvalds/v2.6/linux
a31de51d · Linus Torvalds · 50a8fdd6 · ff8dea97 · a31de51d
Commit a31de51d authored Oct 09, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

drivers/pcmcia/rsrc_mgr.c drivers/pcmcia/rsrc_mgr.c +0 -1

No files found.
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -458,7 +458,6 @@ static void validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
 {
    resource_map_t *m, mm;
    static u_char order[] = { 0xd0, 0xe0, 0xc0, 0xf0 };
-    static int hi = 0, lo = 0;
    u_long b, i, ok = 0;
    /* We do up to four passes through the list */