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-sh7372.c | |
| parent | Merge branch 'pinmux/next/pin-no-gpio' of git://linuxtv.org/pinchartl/fbdev i... (diff) | |
| parent | sh-pfc: r8a7790: Add VIN pin groups and functions (diff) | |
| download | linux-f7a3427f3eec669f5d7ff15d081433dc5621e7c9.tar.xz 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-sh7372.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7372.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7372.c b/drivers/pinctrl/sh-pfc/pfc-sh7372.c index 02526df3ffef..70b522d34821 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7372.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c @@ -23,9 +23,7 @@ #include <linux/io.h> #include <linux/kernel.h> #include <linux/pinctrl/pinconf-generic.h> - -#include <mach/irqs.h> -#include <mach/sh7372.h> +#include <linux/sh_intc.h> #include "core.h" #include "sh_pfc.h" |