[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches into release
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -435,7 +435,7 @@ extern int sbf_port ;
|
||||
|
||||
#endif /* !CONFIG_ACPI */
|
||||
|
||||
int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
|
||||
int acpi_register_gsi (u32 gsi, int triggering, int polarity);
|
||||
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
|
||||
|
||||
/*
|
||||
|
||||
@@ -185,6 +185,7 @@ extern enum system_states {
|
||||
SYSTEM_HALT,
|
||||
SYSTEM_POWER_OFF,
|
||||
SYSTEM_RESTART,
|
||||
SYSTEM_SUSPEND_DISK,
|
||||
} system_state;
|
||||
|
||||
#define TAINT_PROPRIETARY_MODULE (1<<0)
|
||||
|
||||
@@ -60,8 +60,7 @@ extern void machine_crash_shutdown(struct pt_regs *);
|
||||
*/
|
||||
|
||||
extern void kernel_restart_prepare(char *cmd);
|
||||
extern void kernel_halt_prepare(void);
|
||||
extern void kernel_power_off_prepare(void);
|
||||
extern void kernel_shutdown_prepare(enum system_states state);
|
||||
|
||||
extern void kernel_restart(char *cmd);
|
||||
extern void kernel_halt(void);
|
||||
|
||||
Reference in New Issue
Block a user