Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-09 21:04:46 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-09 21:04:46 -0700
commita31de51d821bbb0145f74f4f3dff2784216e6ec7 (patch)
treec50cedb49615a4efa46b6c93617ed3a3ecdb010c
parent50a8fdd61ea73084ec5f599811fd93d32ac7bbec (diff)
parentff8dea978ea4c0c8380f5976f47da3ab83cee07c (diff)
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
into ppc970.osdl.org:/home/torvalds/v2.6/linux
-rw-r--r--drivers/pcmcia/rsrc_mgr.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 32b264fc4023..620b20f7e040 100644
--- 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 */