aboutsummaryrefslogtreecommitdiff
path: root/arch/xtensa/platforms/xtfpga/Makefile
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2015-08-09 20:13:12 -0500
committerGary S. Robertson <gary.robertson@linaro.org>2015-08-09 20:13:12 -0500
commitf0a3665629bd0e3aa440168b55caea721a77f158 (patch)
treeb49c9b4c3f2607f3a299d10c17e3283df9f34673 /arch/xtensa/platforms/xtfpga/Makefile
parente33823607da84625db9f1a2e4eb02c578d240e72 (diff)
parent590e935df0c94b2d7a4584bb26906666176a6133 (diff)
Merge tag 'lsk-v3.18-15.07-rt' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v3.18-rt
LSK RT 15.07 v3.18
Diffstat (limited to 'arch/xtensa/platforms/xtfpga/Makefile')
-rw-r--r--arch/xtensa/platforms/xtfpga/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/xtensa/platforms/xtfpga/Makefile b/arch/xtensa/platforms/xtfpga/Makefile
index b9ae206340cd..7839d38b2337 100644
--- a/arch/xtensa/platforms/xtfpga/Makefile
+++ b/arch/xtensa/platforms/xtfpga/Makefile
@@ -6,4 +6,5 @@
#
# Note 2! The CFLAGS definitions are in the main makefile...
-obj-y = setup.o lcd.o
+obj-y += setup.o
+obj-$(CONFIG_XTFPGA_LCD) += lcd.o