summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-23 10:34:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-23 10:34:47 -0700
commit9d0715630ebf7bf70daa5e6d8db0e3061268c61e (patch)
tree54562185002b22169d81e0fb3c21312cb510ac40 /drivers/clocksource/Makefile
parentc0c463d34adf0c150e5e24fa412fa23f3f7ddc27 (diff)
parent06c3df49521c1b112b777cc4946e5de057c814ba (diff)
downloadblackbird-op-linux-9d0715630ebf7bf70daa5e6d8db0e3061268c61e.tar.gz
blackbird-op-linux-9d0715630ebf7bf70daa5e6d8db0e3061268c61e.zip
Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clocksource: apb: Share APB timer code with other platforms
Diffstat (limited to 'drivers/clocksource/Makefile')
-rw-r--r--drivers/clocksource/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 7922a0cfc99f..85ad1646a7b7 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_SH_TIMER_MTU2) += sh_mtu2.o
obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o
obj-$(CONFIG_CLKBLD_I8253) += i8253.o
obj-$(CONFIG_CLKSRC_MMIO) += mmio.o
+obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o
OpenPOWER on IntegriCloud