aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pnp.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/pnp.h')
-rw-r--r--include/linux/pnp.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 1640562f3ebc..a5487b6a4e57 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -13,14 +13,11 @@
13#include <linux/errno.h> 13#include <linux/errno.h>
14#include <linux/mod_devicetable.h> 14#include <linux/mod_devicetable.h>
15 15
16#define PNP_MAX_PORT 40
17#define PNP_MAX_MEM 24
18#define PNP_MAX_IRQ 2
19#define PNP_MAX_DMA 2
20#define PNP_NAME_LEN 50 16#define PNP_NAME_LEN 50
21 17
22struct pnp_protocol; 18struct pnp_protocol;
23struct pnp_dev; 19struct pnp_dev;
20struct pnp_resource_table;
24 21
25/* 22/*
26 * Resource Management 23 * Resource Management
@@ -184,13 +181,6 @@ struct pnp_option {
184 struct pnp_option *next; /* used to chain dependent resources */ 181 struct pnp_option *next; /* used to chain dependent resources */
185}; 182};
186 183
187struct pnp_resource_table {
188 struct resource port_resource[PNP_MAX_PORT];
189 struct resource mem_resource[PNP_MAX_MEM];
190 struct resource dma_resource[PNP_MAX_DMA];
191 struct resource irq_resource[PNP_MAX_IRQ];
192};
193
194/* 184/*
195 * Device Management 185 * Device Management
196 */ 186 */
@@ -260,7 +250,7 @@ struct pnp_dev {
260 int capabilities; 250 int capabilities;
261 struct pnp_option *independent; 251 struct pnp_option *independent;
262 struct pnp_option *dependent; 252 struct pnp_option *dependent;
263 struct pnp_resource_table res; 253 struct pnp_resource_table *res;
264 254
265 char name[PNP_NAME_LEN]; /* contains a human-readable name */ 255 char name[PNP_NAME_LEN]; /* contains a human-readable name */
266 unsigned short regs; /* ISAPnP: supported registers */ 256 unsigned short regs; /* ISAPnP: supported registers */