diff options
| author |   Len Brown <len.brown@intel.com> | 2008-02-07 03:31:17 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:31:17 -0500 |
| commit | 299cfe38081bea6dcd8b882375f6f65a980bccf9 (patch) | |
| tree | e567c1e908d158d6dce155cc5cf1b4eb8c78c514 /include/linux/acpi.h | |
| parent | Merge branches 'release' and 'throttling-domains' into release (diff) | |
| parent | ACPI: Export acpi_check_resource_conflict (diff) | |
| download | linux-dev-299cfe38081bea6dcd8b882375f6f65a980bccf9.tar.xz linux-dev-299cfe38081bea6dcd8b882375f6f65a980bccf9.zip | |
Merge branches 'release' and 'hwmon-conflicts' into release
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 5a5a13b64d09..25fb4dcc0e6b 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -25,6 +25,7 @@ #ifndef _LINUX_ACPI_H #define _LINUX_ACPI_H +#include <linux/ioport.h> /* for struct resource */ #ifdef CONFIG_ACPI @@ -238,6 +239,13 @@ extern int pnpacpi_disabled; #define PXM_INVAL (-1) #define NID_INVAL (-1) +int acpi_check_resource_conflict(struct resource *res); + +int acpi_check_region(resource_size_t start, resource_size_t n, + const char *name); +int acpi_check_mem_region(resource_size_t start, resource_size_t n, + const char *name); + #else /* CONFIG_ACPI */ static inline int acpi_boot_init(void) @@ -250,5 +258,22 @@ static inline int acpi_boot_table_init(void) return 0; } +static inline int acpi_check_resource_conflict(struct resource *res) +{ + return 0; +} + +static inline int acpi_check_region(resource_size_t start, resource_size_t n, + const char *name) +{ + return 0; +} + +static inline int acpi_check_mem_region(resource_size_t start, + resource_size_t n, const char *name) +{ + return 0; +} + #endif /* !CONFIG_ACPI */ #endif /*_LINUX_ACPI_H*/ |