Merge tag 'v3.14-rc4' into next

Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().

3 files changed, 6 insertions, 2 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 4ffc39732513..7904ab05527a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -168,7 +168,7 @@ config INPUT_MAX8997_HAPTIC
 
 config INPUT_MC13783_PWRBUTTON
         tristate "MC13783 ON buttons"
-        depends on MFD_MC13783
+        depends on MFD_MC13XXX
         help
           Support the ON buttons of MC13783 PMIC as an input device
           reporting power button status.
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index c0c5b63af90a..638165c78e75 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -27,8 +27,8 @@
 #include <linux/module.h>
 #include <linux/input.h>
 #include <linux/types.h>
+#include <linux/acpi.h>
 #include <asm/uaccess.h>
-#include <acpi/acpi_drivers.h>
 
 #define ACPI_ATLAS_NAME         "Atlas ACPI"
 #define ACPI_ATLAS_CLASS        "Atlas"
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index e21c1816a8f9..fbfdc10573be 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -29,6 +29,7 @@
 #include <xen/interface/io/fbif.h>
 #include <xen/interface/io/kbdif.h>
 #include <xen/xenbus.h>
+#include <xen/platform_pci.h>
 
 struct xenkbd_info {
         struct input_dev *kbd;
@@ -380,6 +381,9 @@ static int __init xenkbd_init(void)
         if (xen_initial_domain())
                 return -ENODEV;
 
+        if (!xen_has_pv_devices())
+                return -ENODEV;
+
         return xenbus_register_frontend(&xenkbd_driver);
 }