X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fpnp.h;h=b74b2b643cb23048acbb5fd997e92ad66c5c9c9c;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=d728e2f5cf717da692715c55ce4ee14db33b694a;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/include/linux/pnp.h b/include/linux/pnp.h index d728e2f5c..b74b2b643 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -82,8 +82,9 @@ struct pnp_port { struct pnp_port *next; /* next port */ }; +#define PNP_IRQ_NR 256 struct pnp_irq { - unsigned short map; /* bitmaks for IRQ lines */ + DECLARE_BITMAP(map, PNP_IRQ_NR); /* bitmaks for IRQ lines */ unsigned char flags; /* IRQ flags */ unsigned char pad; /* pad */ struct pnp_irq *next; /* next IRQ */ @@ -200,6 +201,7 @@ struct pnp_dev { unsigned short regs; /* ISAPnP: supported registers */ int flags; /* used by protocols */ struct proc_dir_entry *procent; /* device entry in /proc/bus/isapnp */ + void *data; }; #define global_to_pnp_dev(n) list_entry(n, struct pnp_dev, global_list)