Merge back new material for v4.7.

mariux64 · May 6, 2016 · c854120 · c854120
2 parents 21f8a99 + f47b72a
commit c854120
Show file tree

Hide file tree

Showing 6 changed files with 763 additions and 544 deletions.
diff --git a/drivers/base/power/opp/Makefile b/drivers/base/power/opp/Makefile
@@ -1,3 +1,4 @@
 ccflags-$(CONFIG_DEBUG_DRIVER)	:= -DDEBUG
 obj-y				+= core.o cpu.o
+obj-$(CONFIG_OF)		+= of.o
 obj-$(CONFIG_DEBUG_FS)		+= debugfs.o