diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
commit | 52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch) | |
tree | 86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /arch/arm/mach-shmobile/Makefile | |
parent | e9b7086b80c4d9e354f4edc9e280ae85a60df408 (diff) | |
parent | 8770b07c2dff3cec2c751b289ee690137c88ea54 (diff) | |
download | linux-next-52f3a41e0aca5625fbd118ed57a4debb25817e99.tar.gz |
Merge branch 'fixes-v3.2-rc2' into fixes
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 2aec2f732515..737bdc631b0d 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -3,7 +3,7 @@ # # Common objects -obj-y := timer.o console.o clock.o pm_runtime.o +obj-y := timer.o console.o clock.o # CPU objects obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o intc-sh7367.o |