mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts: drivers/acpi/scan.c
This commit is contained in:
commit
9ccad66f01
103 changed files with 80 additions and 234 deletions
|
|
@ -28,8 +28,6 @@
|
|||
|
||||
#include <linux/device.h>
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
|
||||
/* TBD: Make dynamic */
|
||||
#define ACPI_MAX_HANDLES 10
|
||||
struct acpi_handle_list {
|
||||
|
|
|
|||
|
|
@ -26,9 +26,6 @@
|
|||
#ifndef __ACPI_DRIVERS_H__
|
||||
#define __ACPI_DRIVERS_H__
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <acpi/acpi_bus.h>
|
||||
|
||||
#define ACPI_MAX_STRING 80
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue