diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 22:12:46 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 22:12:46 +0400 |
| commit | ae1cde8c50d0c6afa073eba03b802bbeee861cf9 (patch) | |
| tree | 531cac53b3dd2c5f10d01246af579ef114bb169c /drivers/pinctrl/pinctrl-nomadik.h | |
| parent | e59d969f441fb8e25b30125bdf201153adc5a7e3 (diff) | |
| parent | 9b472600b02f6771c04455f8a0019e2a98e0db88 (diff) | |
| download | linux-ae1cde8c50d0c6afa073eba03b802bbeee861cf9.tar.xz | |
Merge branch 'nomadik' into devel
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.h')
| -rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.h b/drivers/pinctrl/pinctrl-nomadik.h index eef316e979a0..bcd4191e10ea 100644 --- a/drivers/pinctrl/pinctrl-nomadik.h +++ b/drivers/pinctrl/pinctrl-nomadik.h @@ -1,7 +1,7 @@ #ifndef PINCTRL_PINCTRL_NOMADIK_H #define PINCTRL_PINCTRL_NOMADIK_H -#include <plat/gpio-nomadik.h> +#include <linux/platform_data/pinctrl-nomadik.h> /* Package definitions */ #define PINCTRL_NMK_STN8815 0 |