Fix NR_IPI to be 7 instead of 6 because both googly and core add an IPI. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/include/asm/hardware/cache-l2x0.h arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c include/linux/wakelock.h kernel/power/Kconfig kernel/power/Makefile kernel/power/main.c kernel/power/power.h
20 lines
661 B
Makefile
20 lines
661 B
Makefile
|
|
ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG
|
|
|
|
obj-y += qos.o
|
|
obj-$(CONFIG_PM) += main.o
|
|
obj-$(CONFIG_VT_CONSOLE_SLEEP) += console.o
|
|
obj-$(CONFIG_FREEZER) += process.o
|
|
obj-$(CONFIG_SUSPEND) += suspend.o
|
|
obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o
|
|
obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o \
|
|
block_io.o
|
|
obj-$(CONFIG_WAKELOCK) += wakelock.o
|
|
obj-$(CONFIG_USER_WAKELOCK) += userwakelock.o
|
|
obj-$(CONFIG_EARLYSUSPEND) += earlysuspend.o
|
|
obj-$(CONFIG_CONSOLE_EARLYSUSPEND) += consoleearlysuspend.o
|
|
obj-$(CONFIG_FB_EARLYSUSPEND) += fbearlysuspend.o
|
|
obj-$(CONFIG_SUSPEND_TIME) += suspend_time.o
|
|
|
|
obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o
|