summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform/Makefile
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2015-04-14 03:51:35 +0000
committerChris Zankel <chris@zankel.net>2015-04-14 03:51:35 +0000
commit7ead5b7e4a3cf4a16579a8f164022345b93fe972 (patch)
tree0a9b9497f53d1593c9e2ac197b2e686ea74a9975 /arch/x86/platform/Makefile
parent834a316eeebcb75316c0a7d9088fa638c52dc584 (diff)
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff)
downloadlinux-7ead5b7e4a3cf4a16579a8f164022345b93fe972.tar.bz2
Merge tag 'v4.0' into for_next
Linux 4.0
Diffstat (limited to 'arch/x86/platform/Makefile')
-rw-r--r--arch/x86/platform/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index 85afde1fa3e5..a62e0be3a2f1 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -5,6 +5,7 @@ obj-y += geode/
obj-y += goldfish/
obj-y += iris/
obj-y += intel-mid/
+obj-y += intel-quark/
obj-y += olpc/
obj-y += scx200/
obj-y += sfi/