projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc-2.6.33' into release
[cascardo/linux.git]
/
include
/
linux
/
acpi.h
diff --git
a/include/linux/acpi.h
b/include/linux/acpi.h
index
e11090d
..
ce945d4
100644
(file)
--- a/
include/linux/acpi.h
+++ b/
include/linux/acpi.h
@@
-240,7
+240,7
@@
extern int pnpacpi_disabled;
#define PXM_INVAL (-1)
#define NID_INVAL (-1)
-int acpi_check_resource_conflict(struct resource *res);
+int acpi_check_resource_conflict(
const
struct resource *res);
int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name);