diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-07-29 16:33:57 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-07-29 16:33:57 +0200 |
| commit | f7a3427f3eec669f5d7ff15d081433dc5621e7c9 (patch) | |
| tree | e45241a56fb2b9dd88fb9a7295789686f722e331 /drivers/pinctrl/sh-pfc/pfc-r8a7740.c | |
| parent | da52faa5715d1d3596b2b05030022f3d4bc56087 (diff) | |
| parent | e120cacfaac24d4de31b181371daaef6a5773ee3 (diff) | |
| download | blackbird-op-linux-f7a3427f3eec669f5d7ff15d081433dc5621e7c9.tar.gz blackbird-op-linux-f7a3427f3eec669f5d7ff15d081433dc5621e7c9.zip | |
Merge branch 'pinmux/next/fixes' of git://linuxtv.org/pinchartl/fbdev into devel
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pfc-r8a7740.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index 2c745368afa3..009174d07767 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -22,7 +22,6 @@ #include <linux/kernel.h> #include <linux/pinctrl/pinconf-generic.h> -#include <mach/r8a7740.h> #include <mach/irqs.h> #include "core.h" |
