diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 17:44:09 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 17:44:09 -0500 |
| commit | 98feb7cc61c50fe0fa36eeb994d5db527ca9e103 (patch) | |
| tree | 3edae44f2dd6fe7b431786ca9c308250f1345511 /drivers/pnp | |
| parent | 7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 (diff) | |
| parent | f8a571b2a128a1697624c1b132f3af07848ebbcf (diff) | |
Merge branch 'acpi-cleanup'
* acpi-cleanup: (22 commits)
ACPI / tables: Return proper error codes from acpi_table_parse() and fix comment.
ACPI / tables: Check if id is NULL in acpi_table_parse()
ACPI / proc: Include appropriate header file in proc.c
ACPI / EC: Remove unused functions and add prototype declaration in internal.h
ACPI / dock: Include appropriate header file in dock.c
ACPI / PCI: Include appropriate header file in pci_link.c
ACPI / PCI: Include appropriate header file in pci_slot.c
ACPI / EC: Mark the function acpi_ec_add_debugfs() as static in ec_sys.c
ACPI / NVS: Include appropriate header file in nvs.c
ACPI / OSL: Mark the function acpi_table_checksum() as static
ACPI / processor: initialize a variable to silence compiler warning
ACPI / processor: use ACPI_COMPANION() to get ACPI device
ACPI: correct minor typos
ACPI / sleep: Drop redundant acpi_disabled check
ACPI / dock: Drop redundant acpi_disabled check
ACPI / table: Replace '1' with specific error return values
ACPI: remove trailing whitespace
ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>
SFI / ACPI: Fix warnings reported during builds with W=1
...
Conflicts:
drivers/acpi/nvs.c
drivers/hwmon/asus_atk0110.c
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 1 | ||||
| -rw-r--r-- | drivers/pnp/pnpacpi/pnpacpi.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 14655a0f0431..e869ba698ac0 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/pnp.h> | 24 | #include <linux/pnp.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | #include <linux/mod_devicetable.h> | 26 | #include <linux/mod_devicetable.h> |
| 27 | #include <acpi/acpi_bus.h> | ||
| 28 | 27 | ||
| 29 | #include "../base.h" | 28 | #include "../base.h" |
| 30 | #include "pnpacpi.h" | 29 | #include "pnpacpi.h" |
diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h index 3e60225b0227..051ef9699777 100644 --- a/drivers/pnp/pnpacpi/pnpacpi.h +++ b/drivers/pnp/pnpacpi/pnpacpi.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef ACPI_PNP_H | 1 | #ifndef ACPI_PNP_H |
| 2 | #define ACPI_PNP_H | 2 | #define ACPI_PNP_H |
| 3 | 3 | ||
| 4 | #include <acpi/acpi_bus.h> | ||
| 5 | #include <linux/acpi.h> | 4 | #include <linux/acpi.h> |
| 6 | #include <linux/pnp.h> | 5 | #include <linux/pnp.h> |
| 7 | 6 | ||