This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 9cd73a4..041f660 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -439,7 +439,6 @@ 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;
@@ -473,30 +472,4 @@ 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 max_cstate;
-
-static inline unsigned int acpi_get_cstate_limit(void)
-{
-       return max_cstate;
-}
-static inline void acpi_set_cstate_limit(unsigned int new_limit)
-{
-       max_cstate = 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*/