summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-samsung.h
diff options
context:
space:
mode:
authorArnd Bergmann2013-04-19 23:12:42 +0200
committerArnd Bergmann2013-04-19 23:12:42 +0200
commit22cf644e03419b4c3d002109b021c7482306f0bf (patch)
treedb426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /drivers/pinctrl/pinctrl-samsung.h
parentLinux 3.9-rc6 (diff)
parentARM: exynos: restore mach/regs-clock.h for exynos5 (diff)
downloadkernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz
kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz
kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final exynos multiplatform changes, so let's pull in the entire branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pinctrl/pinctrl-samsung.h')
-rw-r--r--drivers/pinctrl/pinctrl-samsung.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-samsung.h b/drivers/pinctrl/pinctrl-samsung.h
index e2d4e67f7e88..ee964aadce0c 100644
--- a/drivers/pinctrl/pinctrl-samsung.h
+++ b/drivers/pinctrl/pinctrl-samsung.h
@@ -237,5 +237,6 @@ struct samsung_pmx_func {
/* list of all exported SoC specific data */
extern struct samsung_pin_ctrl exynos4210_pin_ctrl[];
extern struct samsung_pin_ctrl exynos4x12_pin_ctrl[];
+extern struct samsung_pin_ctrl exynos5250_pin_ctrl[];
#endif /* __PINCTRL_SAMSUNG_H */