Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
[firefly-linux-kernel-4.4.55.git] / drivers / idle / Makefile
1 obj-$(CONFIG_I7300_IDLE)                        += i7300_idle.o
2 obj-$(CONFIG_INTEL_IDLE)                        += intel_idle.o
3