diff options
author | Thomas Renninger <trenn@suse.de> | 2008-02-05 02:31:23 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 01:00:23 -0500 |
commit | 443dea72d5f428170de6d6e3c4c1a1e2b7632b65 (patch) | |
tree | a93ee8027d58c17dfa47fd7b8750b7cf67219e8c /include/linux/acpi.h | |
parent | df92e695998e1bc6e426a840eb86d6d1ee87e2a5 (diff) |
ACPI: Export acpi_check_resource_conflict
Export acpi_check_resource_conflict(), sometimes drivers already have
a struct resource at hand so no need to use the wrappers to build a new
one.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 893f90a5dea9..a031df8c83ae 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -25,6 +25,7 @@ | |||
25 | #ifndef _LINUX_ACPI_H | 25 | #ifndef _LINUX_ACPI_H |
26 | #define _LINUX_ACPI_H | 26 | #define _LINUX_ACPI_H |
27 | 27 | ||
28 | #include <linux/ioport.h> /* for struct resource */ | ||
28 | 29 | ||
29 | #ifdef CONFIG_ACPI | 30 | #ifdef CONFIG_ACPI |
30 | 31 | ||
@@ -217,6 +218,8 @@ extern int pnpacpi_disabled; | |||
217 | #define PXM_INVAL (-1) | 218 | #define PXM_INVAL (-1) |
218 | #define NID_INVAL (-1) | 219 | #define NID_INVAL (-1) |
219 | 220 | ||
221 | int acpi_check_resource_conflict(struct resource *res); | ||
222 | |||
220 | int acpi_check_region(resource_size_t start, resource_size_t n, | 223 | int acpi_check_region(resource_size_t start, resource_size_t n, |
221 | const char *name); | 224 | const char *name); |
222 | int acpi_check_mem_region(resource_size_t start, resource_size_t n, | 225 | int acpi_check_mem_region(resource_size_t start, resource_size_t n, |
@@ -234,6 +237,11 @@ static inline int acpi_boot_table_init(void) | |||
234 | return 0; | 237 | return 0; |
235 | } | 238 | } |
236 | 239 | ||
240 | static inline int acpi_check_resource_conflict(struct resource *res) | ||
241 | { | ||
242 | return 0; | ||
243 | } | ||
244 | |||
237 | static inline int acpi_check_region(resource_size_t start, resource_size_t n, | 245 | static inline int acpi_check_region(resource_size_t start, resource_size_t n, |
238 | const char *name) | 246 | const char *name) |
239 | { | 247 | { |