Merge branches 'release' and 'video' into release
Conflicts: include/acpi/acpi_bus.h Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -323,6 +323,9 @@ extern struct kobject *acpi_kobj;
|
||||
extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
|
||||
void acpi_bus_private_data_handler(acpi_handle, u32, void *);
|
||||
int acpi_bus_get_private_data(acpi_handle, void **);
|
||||
extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32);
|
||||
extern int register_acpi_notifier(struct notifier_block *);
|
||||
extern int unregister_acpi_notifier(struct notifier_block *);
|
||||
/*
|
||||
* External Functions
|
||||
*/
|
||||
|
Reference in New Issue
Block a user