git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[sfrench/cifs-2.6.git]
/
include
/
linux
/
acpi.h
diff --git
a/include/linux/acpi.h
b/include/linux/acpi.h
index ce945d4845fcc158c3e493a7d64c986cad7e1072..b926afe8c03e7f846043ec78e2bbfb0cc021497e 100644
(file)
--- a/
include/linux/acpi.h
+++ b/
include/linux/acpi.h
@@
-80,7
+80,7
@@
char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
void __acpi_unmap_table(char *map, unsigned long size);
int early_acpi_boot_init(void);
int acpi_boot_init (void);
void __acpi_unmap_table(char *map, unsigned long size);
int early_acpi_boot_init(void);
int acpi_boot_init (void);
-
int
acpi_boot_table_init (void);
+
void
acpi_boot_table_init (void);
int acpi_mps_check (void);
int acpi_numa_init (void);
int acpi_mps_check (void);
int acpi_numa_init (void);
@@
-251,6
+251,7
@@
int acpi_check_mem_region(resource_size_t start, resource_size_t n,
void __init acpi_no_s4_hw_signature(void);
void __init acpi_old_suspend_ordering(void);
void __init acpi_s4_no_nvs(void);
void __init acpi_no_s4_hw_signature(void);
void __init acpi_old_suspend_ordering(void);
void __init acpi_s4_no_nvs(void);
+void __init acpi_set_sci_en_on_resume(void);
#endif /* CONFIG_PM_SLEEP */
struct acpi_osc_context {
#endif /* CONFIG_PM_SLEEP */
struct acpi_osc_context {
@@
-320,9
+321,9
@@
static inline int acpi_boot_init(void)
return 0;
}
return 0;
}
-static inline
int
acpi_boot_table_init(void)
+static inline
void
acpi_boot_table_init(void)
{
{
- return
0
;
+ return;
}
static inline int acpi_mps_check(void)
}
static inline int acpi_mps_check(void)