summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-mpc5200.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-02-22 13:47:49 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-02-22 13:47:49 +0100
commit3cf42efc3479806bc5db5176fd440d23bb73854b (patch)
treea6a0a57cbe89a4f779625f8ce6e8ebc7ea49f2c0 /drivers/gpio/gpio-mpc5200.c
parent6ec9249a83b00a754af435ed57ad02ffed105d93 (diff)
parent9d8cc89c316d9cc8ff269068ac8f904f13b5a70d (diff)
Merge branch 'devel' into for-next
Diffstat (limited to 'drivers/gpio/gpio-mpc5200.c')
-rw-r--r--drivers/gpio/gpio-mpc5200.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c
index 0e5a6709f27d..fc10cf59691c 100644
--- a/drivers/gpio/gpio-mpc5200.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -25,7 +25,6 @@
#include <linux/of_platform.h>
#include <linux/module.h>
-#include <asm/gpio.h>
#include <asm/mpc52xx.h>
#include <sysdev/fsl_soc.h>