summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pnp/isapnp/core.c3
-rw-r--r--include/linux/pnp.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index a3f1566ccea5..f1bccdbdeb08 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/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/include/linux/pnp.h b/include/linux/pnp.h
index f5b985e912ae..e3b2c0068de7 100644
--- a/include/linux/pnp.h
+++ b/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;