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

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

Browse Source
This commit is contained in:
Len Brown
2009-06-24 01:19:50 -04:00
parent 4e8a2372f9 e86435eb91 7fe2a6c275 0705495d90 35a7c64fbc 152a4e630f 86e437f077 c8d72a5e76 7a04b8491a ee1ca48fae 9eccbc2f67 7e275cc4e8 7b768f07dc 8cb24c8fd7 113b3a2b90 d73772474f 056c308d3e 871043bc46
commit fbe8cddd2d
39 changed files with 1708 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/acpi.h
View File

@ -113,9 +113,6 @@ void acpi_irq_stats_init(void);
extern u32 acpi_irq_handled;
extern u32 acpi_irq_not_handled;
extern struct acpi_mcfg_allocation *pci_mmcfg_config;
extern int pci_mmcfg_config_num;
extern int sbf_port;
extern unsigned long acpi_realmode_flags;
@ -293,7 +290,10 @@ void __init acpi_s4_no_nvs(void);
OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)
extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags);
extern void acpi_early_init(void);
#else /* CONFIG_ACPI */
static inline void acpi_early_init(void) { }
static inline int early_acpi_boot_init(void)
{