mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
Merge branch 'misc-2.6.33' into release
This commit is contained in:
commit
aa96ce0af8
10 changed files with 60 additions and 52 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue