---

yaml --- r: 26151 b: refs/heads/master c: 2aff541 h: refs/heads/master i: 26149: f1d265f 26147: bb7b01a 26143: 866a888 v: v3
git-mirror · Apr 21, 2006 · df3cb7f · df3cb7f
1 parent df7248c
commit df3cb7f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80a55e923c76e022de298929e0c09bcca5c247d9
+refs/heads/master: 2aff541c691b28cecb95ce710c367d16c0a84d8c
diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c
@@ -88,7 +88,6 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base,
 	}
 	if ((s->features & SS_CAP_STATIC_MAP) && s->io_offset) {
 		*base = s->io_offset | (*base & 0x0fff);
-		s->io[0].res->flags = (s->io[0].res->flags & ~IORESOURCE_BITS) | (attr & IORESOURCE_BITS);
 		return 0;
 	}
 	/* Check for an already-allocated window that must conflict with