Merge branch 'acpi-cleanup' into acpi-hotplug

Conflicts:
	drivers/acpi/scan.c
This commit is contained in:
Rafael J. Wysocki 2013-12-07 01:05:17 +01:00
commit 9ccad66f01
103 changed files with 80 additions and 234 deletions

View file

@ -28,8 +28,6 @@
#include <linux/device.h>
#include <acpi/acpi.h>
/* TBD: Make dynamic */
#define ACPI_MAX_HANDLES 10
struct acpi_handle_list {

View file

@ -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
/*