Merge branch 'linus' into perf/core, to fix conflicts
[firefly-linux-kernel-4.4.55.git] / arch / x86 / platform / ce4100 / Makefile
1 obj-$(CONFIG_X86_INTEL_CE)      += ce4100.o