From b3bbdc6fe1cdd25f5d55e22a323dfa8ef0d0acce Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 28 Apr 2008 16:34:41 -0600
Subject: [PATCH] --- yaml --- r: 95595 b: refs/heads/master c:
 261b20da4bd349f1b26e206f440809f1351be34b h: refs/heads/master i:   95593:
 f70905adcf7f139aa1a647d84513b72c5be0a256   95591:
 f389ff0afbefd1e775d1f80a366eda4a97a59114 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pnp/isapnp/core.c | 3 ---
 trunk/include/linux/pnp.h       | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b88693b15ba0..2252765b0810 100644
--- 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
index a3f1566ccea5..f1bccdbdeb08 100644
--- 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
index f5b985e912ae..e3b2c0068de7 100644
--- 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;