Merge branch 'misc-2.6.33' into release
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user