diff options
-rw-r--r-- | drivers/pnp/isapnp/core.c | 3 | ||||
-rw-r--r-- | include/linux/pnp.h | 1 |
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, | |||
416 | if (!dev) | 416 | if (!dev) |
417 | return NULL; | 417 | return NULL; |
418 | 418 | ||
419 | dev->regs = tmp[4]; | ||
420 | dev->card = card; | 419 | dev->card = card; |
421 | if (size > 5) | ||
422 | dev->regs |= tmp[5] << 8; | ||
423 | dev->capabilities |= PNP_CONFIGURABLE; | 420 | dev->capabilities |= PNP_CONFIGURABLE; |
424 | dev->capabilities |= PNP_READ; | 421 | dev->capabilities |= PNP_READ; |
425 | dev->capabilities |= PNP_WRITE; | 422 | 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 { | |||
253 | struct pnp_resource_table *res; | 253 | struct pnp_resource_table *res; |
254 | 254 | ||
255 | char name[PNP_NAME_LEN]; /* contains a human-readable name */ | 255 | char name[PNP_NAME_LEN]; /* contains a human-readable name */ |
256 | unsigned short regs; /* ISAPnP: supported registers */ | ||
257 | int flags; /* used by protocols */ | 256 | int flags; /* used by protocols */ |
258 | struct proc_dir_entry *procent; /* device entry in /proc/bus/isapnp */ | 257 | struct proc_dir_entry *procent; /* device entry in /proc/bus/isapnp */ |
259 | void *data; | 258 | void *data; |