summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/tegra/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-08-07 08:36:12 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-08-07 08:36:12 +0200
commit5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch)
treeca7d7b1480285e3b617fecc5b41f0ce150a82c32 /drivers/gpu/drm/tegra/Makefile
parentInput: document INPUT_PROP_TOPBUTTONPAD (diff)
parentMerge branch 'wacom' into next (diff)
downloadlinux-5e2aa2ed08e2e280121dc7cf5609c87d464f12ef.tar.xz
linux-5e2aa2ed08e2e280121dc7cf5609c87d464f12ef.zip
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'drivers/gpu/drm/tegra/Makefile')
-rw-r--r--drivers/gpu/drm/tegra/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile
index d43f21bb4596..2c66a8db9da4 100644
--- a/drivers/gpu/drm/tegra/Makefile
+++ b/drivers/gpu/drm/tegra/Makefile
@@ -1,7 +1,6 @@
ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG
tegra-drm-y := \
- bus.o \
drm.o \
gem.o \
fb.o \