diff options
| author | Len Brown <len.brown@intel.com> | 2004-11-10 05:50:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-11-10 05:50:27 -0500 |
| commit | 42bca1332a37773c0c9b63cfb7be672078ef8947 (patch) | |
| tree | 61264e7b7669388f0d37bebfb449f1e4e0874557 /include/linux | |
| parent | 31a3791056e43c6dd7386b8bc0f5fb94848c5a61 (diff) | |
| parent | 7977cad2a89e2412a877376ee21f0f913244527f (diff) | |
merge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 27 | ||||
| -rw-r--r-- | include/linux/pnp.h | 4 |
2 files changed, 30 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 041f660ec009..5960e3c49fe7 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -439,6 +439,7 @@ extern struct acpi_prt_list acpi_prt; struct pci_dev; int acpi_pci_irq_enable (struct pci_dev *dev); +void acpi_penalize_isa_irq(int irq); struct acpi_pci_driver { struct acpi_pci_driver *next; @@ -472,4 +473,30 @@ static inline int acpi_blacklisted(void) #endif /*!CONFIG_ACPI_INTERPRETER*/ +#define ACPI_CSTATE_LIMIT_DEFINED /* for driver builds */ +#ifdef CONFIG_ACPI + +/* + * Set highest legal C-state + * 0: C0 okay, but not C1 + * 1: C1 okay, but not C2 + * 2: C2 okay, but not C3 etc. + */ + +extern unsigned int acpi_cstate_limit; + +static inline unsigned int acpi_get_cstate_limit(void) +{ + return acpi_cstate_limit; +} +static inline void acpi_set_cstate_limit(unsigned int new_limit) +{ + acpi_cstate_limit = new_limit; + return; +} +#else +static inline unsigned int acpi_get_cstate_limit(void) { return 0; } +static inline void acpi_set_cstate_limit(unsigned int new_limit) { return; } +#endif + #endif /*_LINUX_ACPI_H*/ diff --git a/include/linux/pnp.h b/include/linux/pnp.h index d728e2f5cf71..b74b2b643cb2 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) |