diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
| commit | 7b7631791ed9cad14ed0f54376049fab8807ea2c (patch) | |
| tree | 52341281ba5905b78dcb7f69158c4654b8bbffc4 /drivers/pinctrl/Makefile | |
| parent | cdfca5dccb21258eccd549604a8481020d5f3e9f (diff) | |
| parent | 4c13cf95b2e37de75b26f2e8770d3b7328e32498 (diff) | |
| download | barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.gz barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.xz | |
Merge branch 'for-next/tegra'
Conflicts:
arch/arm/dts/tegra20-colibri.dtsi
arch/arm/dts/tegra20-paz00.dts
arch/arm/dts/tegra20.dtsi
drivers/clk/tegra/clk-periph.c
Diffstat (limited to 'drivers/pinctrl/Makefile')
| -rw-r--r-- | drivers/pinctrl/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 9a5d0ba97e..3978c5692f 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_PINCTRL_IMX_IOMUX_V3) += imx-iomux-v3.o obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o +obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o |