diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-11-14 08:49:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-11-14 08:49:49 +0100 |
| commit | a7a0aaa17ace589897021d668e09d474e7fc4c4d (patch) | |
| tree | 41de5bb6fb7135d950ef8b344e1e02d1208449c8 /drivers/extcon/extcon-gpio.c | |
| parent | 38ca9c927c7d3db61f57e3d3a9334958c3af6e9a (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | olio-linux-3.10-a7a0aaa17ace589897021d668e09d474e7fc4c4d.tar.xz olio-linux-3.10-a7a0aaa17ace589897021d668e09d474e7fc4c4d.zip | |
Merge tag 'v3.7-rc5' into sched/core
Merge Linux 3.7-rc5, to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/extcon/extcon-gpio.c')
| -rw-r--r-- | drivers/extcon/extcon-gpio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c index 3cc152e690b..71d3ab7b3d8 100644 --- a/drivers/extcon/extcon-gpio.c +++ b/drivers/extcon/extcon-gpio.c @@ -26,7 +26,6 @@ #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include <linux/extcon.h> #include <linux/workqueue.h> #include <linux/gpio.h> #include <linux/extcon.h> |