From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 8 Jan 2014 02:07:06 +0000 (+1100)
Subject: Merge remote-tracking branch 'input/next'
X-Git-Tag: next-20140108~48
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4f0914b4c7362f34bae34591755d2f6f4ba59984;p=karo-tx-linux.git

Merge remote-tracking branch 'input/next'
---

4f0914b4c7362f34bae34591755d2f6f4ba59984
diff --cc drivers/input/misc/atlas_btns.c
index d781b5e52065,c0c5b63af90a..638165c78e75
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@@ -25,11 -25,10 +25,10 @@@
  
  #include <linux/kernel.h>
  #include <linux/module.h>
- #include <linux/init.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"