diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-28 11:31:53 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-28 11:31:53 -0800 |
| commit | ecca8194c16bdf6cde99a2b29c23a77901cd61a6 (patch) | |
| tree | 80b533b480b94b1bdc4dad3b0d300868f44cde04 /arch/arm/mach-msm/Makefile | |
| parent | d1f4cec78ee3141a78b2b35969f5bebf7ea9b208 (diff) | |
| parent | 07a3cc4814f790354d4c7be2c9dc6143a714a07a (diff) | |
| download | kernel_samsung_smdk4412-ecca8194c16bdf6cde99a2b29c23a77901cd61a6.tar.gz kernel_samsung_smdk4412-ecca8194c16bdf6cde99a2b29c23a77901cd61a6.tar.bz2 kernel_samsung_smdk4412-ecca8194c16bdf6cde99a2b29c23a77901cd61a6.zip | |
Merge branch 'msm-core' into for-next
* msm-core:
msm: Clean up useless ifdefs
msm: clock: Add support for more proc_comm clocks
msm: clock: Invert debugfs directory layout
msm: clock: Move debugfs code from clock.c to clock-debug.c
msm: clock: Remove 7x30 and pcom includes from clock.h
msm: clock: Remove unused code and definitions
msm: Warning fix in trout gpio board file
msm: Remove broken register definition from trout
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 0e5c9dc2383..c7964417dae 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,4 +1,7 @@ obj-y += io.o idle.o timer.o +ifdef CONFIG_MSM_PROC_COMM +obj-$(CONFIG_DEBUG_FS) += clock-debug.o +endif obj-$(CONFIG_MSM_VIC) += irq-vic.o |