lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'release', 'dmi', 'idle' and 'misc' into release

Browse Source
This commit is contained in:
Len Brown
2008-02-14 02:44:28 -05:00
parent 46c1fbdb71 fe8e288a63 6bf69b5ebf
commit f60d63f642
16 changed files with 213 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/osl.c
View File

@ -325,7 +325,7 @@ acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
}
#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
struct acpi_table_header *acpi_find_dsdt_initrd(void)
static struct acpi_table_header *acpi_find_dsdt_initrd(void)
{
struct file *firmware_file;
mm_segment_t oldfs;
@ -419,7 +419,7 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
}
#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
int __init acpi_no_initrd_override_setup(char *s)
static int __init acpi_no_initrd_override_setup(char *s)
{
acpi_no_initrd_override = 1;
return 1;