Commit a31de51d authored by Linus Torvalds's avatar Linus Torvalds

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 50a8fdd6 ff8dea97
...@@ -458,7 +458,6 @@ static void validate_mem(struct pcmcia_socket *s, unsigned int probe_mask) ...@@ -458,7 +458,6 @@ static void validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
{ {
resource_map_t *m, mm; resource_map_t *m, mm;
static u_char order[] = { 0xd0, 0xe0, 0xc0, 0xf0 }; static u_char order[] = { 0xd0, 0xe0, 0xc0, 0xf0 };
static int hi = 0, lo = 0;
u_long b, i, ok = 0; u_long b, i, ok = 0;
/* We do up to four passes through the list */ /* We do up to four passes through the list */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment