diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2013-03-22 10:34:07 -0400 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@avionic-design.de> | 2013-04-22 06:39:59 -0400 |
| commit | 692e6d7be8099225f04b2d97299bc03479a5fcdb (patch) | |
| tree | 13e5a72eeaca72c0b73a668f5f683df6e01619d0 /drivers/gpu/host1x/Makefile | |
| parent | c89c0ea63fcd045bdc17076fd078676e1da0c41a (diff) | |
gpu: host1x: Remove second host1x driver
Remove second host1x driver, and bind tegra-drm to the new host1x
driver. The logic to parse device tree and track clients is moved
to drm.c.
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/gpu/host1x/Makefile')
| -rw-r--r-- | drivers/gpu/host1x/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile index 4761e8af7bdc..9a6fc767f6b8 100644 --- a/drivers/gpu/host1x/Makefile +++ b/drivers/gpu/host1x/Makefile | |||
| @@ -13,6 +13,6 @@ host1x-y = \ | |||
| 13 | ccflags-y += -Iinclude/drm | 13 | ccflags-y += -Iinclude/drm |
| 14 | ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG | 14 | ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG |
| 15 | 15 | ||
| 16 | host1x-$(CONFIG_DRM_TEGRA) += drm/drm.o drm/fb.o drm/dc.o drm/host1x.o | 16 | host1x-$(CONFIG_DRM_TEGRA) += drm/drm.o drm/fb.o drm/dc.o |
| 17 | host1x-$(CONFIG_DRM_TEGRA) += drm/output.o drm/rgb.o drm/hdmi.o | 17 | host1x-$(CONFIG_DRM_TEGRA) += drm/output.o drm/rgb.o drm/hdmi.o |
| 18 | obj-$(CONFIG_TEGRA_HOST1X) += host1x.o | 18 | obj-$(CONFIG_TEGRA_HOST1X) += host1x.o |