diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 03:49:19 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 03:49:19 +0400 |
| commit | 879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch) | |
| tree | 0399664761f675eef741f8b08b92635069586151 /drivers/gpu/drm/tegra/Makefile | |
| parent | 70a26071f8552a0f193cf442f424decfe0f2e569 (diff) | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| download | linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.xz | |
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'drivers/gpu/drm/tegra/Makefile')
| -rw-r--r-- | drivers/gpu/drm/tegra/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile index 8d220afbd85f..d43f21bb4596 100644 --- a/drivers/gpu/drm/tegra/Makefile +++ b/drivers/gpu/drm/tegra/Makefile @@ -11,6 +11,8 @@ tegra-drm-y := \ hdmi.o \ mipi-phy.o \ dsi.o \ + sor.o \ + dpaux.o \ gr2d.o \ gr3d.o |