---

yaml --- r: 95595 b: refs/heads/master c: 261b20d h: refs/heads/master i: 95593: f70905a 95591: f389ff0 v: v3
git-mirror · Apr 29, 2008 · b3bbdc6 · b3bbdc6
1 parent a22331f
commit b3bbdc6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62cfb298b95d713825deb8faf2044c45a1e17a0a
+refs/heads/master: 261b20da4bd349f1b26e206f440809f1351be34b
diff --git a/trunk/drivers/pnp/isapnp/core.c b/trunk/drivers/pnp/isapnp/core.c
@@ -416,10 +416,7 @@ static struct pnp_dev *__init isapnp_parse_device(struct pnp_card *card,
 	if (!dev)
 		return NULL;
 
-	dev->regs = tmp[4];
 	dev->card = card;
-	if (size > 5)
-		dev->regs |= tmp[5] << 8;
 	dev->capabilities |= PNP_CONFIGURABLE;
 	dev->capabilities |= PNP_READ;
 	dev->capabilities |= PNP_WRITE;

diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h
@@ -253,7 +253,6 @@ struct pnp_dev {
 	struct pnp_resource_table *res;
 
 	char name[PNP_NAME_LEN];	/* contains a human-readable name */
-	unsigned short regs;		/* ISAPnP: supported registers */
 	int flags;			/* used by protocols */
 	struct proc_dir_entry *procent;	/* device entry in /proc/bus/isapnp */
 	void *data;