diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-27 01:03:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-27 01:03:27 +0100 |
| commit | 2d304ba757eb79f58451538497b4f556555e3eb7 (patch) | |
| tree | 6deb6799a3a3743047045324ad5218936b9f35b4 /drivers/hwmon | |
| parent | 434a438af20865cd41ab08c07281b72637460e41 (diff) | |
| parent | 91be0998578a1001db1382012676ee0a69d5cee3 (diff) | |
Merge branch 'acpica'
* acpica:
ACPI: Clean up incorrect inclusions of ACPICA headers
ACPICA: Update version to 20131115.
ACPICA: Add support to delete all objects attached to the root namespace node.
ACPICA: Delete all attached data objects during namespace node deletion.
ACPICA: Resources: Fix loop termination for the get AML length function.
ACPICA: Tests: Add CHECKSUM_ABORT protection for test utilities.
ACPICA: Debug output: Do not emit function nesting level for kernel build.
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/asus_atk0110.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index 1d7ff46812c..dafc63c6932 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -18,7 +18,6 @@ #include <linux/err.h> #include <acpi/acpi.h> -#include <acpi/acpixf.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h> |