diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 19:34:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 19:34:47 +0200 |
| commit | 9d0715630ebf7bf70daa5e6d8db0e3061268c61e (patch) | |
| tree | 54562185002b22169d81e0fb3c21312cb510ac40 /drivers/clocksource/Makefile | |
| parent | Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-... (diff) | |
| parent | clocksource: apb: Share APB timer code with other platforms (diff) | |
| download | linux-9d0715630ebf7bf70daa5e6d8db0e3061268c61e.tar.xz 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/Makefile | 1 |
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 |