diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-04 17:15:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-04 17:15:03 +0200 |
| commit | 7813029a509c0c92a5b16d846defaa50a2d3d7f1 (patch) | |
| tree | 1962ab81537b7155d185f4b0b06c0323ff4dc509 /drivers/pinctrl/tegra/Makefile | |
| parent | Merge tag 'iio-for-4.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic... (diff) | |
| parent | Linux 4.7-rc6 (diff) | |
| download | linux-7813029a509c0c92a5b16d846defaa50a2d3d7f1.tar.xz linux-7813029a509c0c92a5b16d846defaa50a2d3d7f1.zip | |
Merge 4.7-rc6 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl/tegra/Makefile')
| -rw-r--r-- | drivers/pinctrl/tegra/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/tegra/Makefile b/drivers/pinctrl/tegra/Makefile index a927379b6794..d9ea2be69cc4 100644 --- a/drivers/pinctrl/tegra/Makefile +++ b/drivers/pinctrl/tegra/Makefile @@ -1,4 +1,4 @@ -obj-y += pinctrl-tegra.o +obj-$(CONFIG_PINCTRL_TEGRA) += pinctrl-tegra.o obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o obj-$(CONFIG_PINCTRL_TEGRA114) += pinctrl-tegra114.o |