diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/arm/mach-s5pv210/Makefile | |
parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
download | linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/arm/mach-s5pv210/Makefile')
-rw-r--r-- | arch/arm/mach-s5pv210/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile index ef7e4668d670..009fbe53df96 100644 --- a/arch/arm/mach-s5pv210/Makefile +++ b/arch/arm/mach-s5pv210/Makefile @@ -14,7 +14,7 @@ obj- := obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o -obj-$(CONFIG_PM) += pm.o sleep.o +obj-$(CONFIG_PM) += pm.o # machine support |