Messages in this thread | | | Date | Wed, 22 Jan 2014 16:42:54 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drivers-x86 tree with the pm tree |
| |
Hi Matthew,
Today's linux-next merge of the drivers-x86 tree got a conflict in drivers/platform/x86/mxm-wmi.c between commit 8b48463f8942 ("ACPI: Clean up inclusions of ACPI header files") from the pm tree and commit 475879d65123 ("drivers: platform: Include appropriate header file in mxm-wmi.c") from the drivers-x86 tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/platform/x86/mxm-wmi.c index 3c59c0a3ee0f,7503d2b9b073..000000000000 --- a/drivers/platform/x86/mxm-wmi.c +++ b/drivers/platform/x86/mxm-wmi.c @@@ -20,7 -20,9 +20,8 @@@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> + #include <linux/mxm-wmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR("Dave Airlie"); MODULE_DESCRIPTION("MXM WMI Driver"); [unhandled content-type:application/pgp-signature] | |