diff options
| author | Tom Rini <[email protected]> | 2020-10-05 13:05:46 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-10-05 14:10:59 -0400 |
| commit | b7e7831e5d5be047f421ddc1f308afc22764a893 (patch) | |
| tree | 7d5f27c82b260278ed0b3ea96bce592b0505b898 /drivers/timer/Makefile | |
| parent | 050acee119b3757fee3bd128f55d720fdd9bb890 (diff) | |
| parent | caebff09efe8c061b4d99b82262c67fb2db9bbcf (diff) | |
Merge branch 'next'
Bring in the assorted changes that have been staged in the 'next' branch
prior to release.
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers/timer/Makefile')
| -rw-r--r-- | drivers/timer/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index c22ffebcdec..3a4d74b996b 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -22,3 +22,4 @@ obj-$(CONFIG_STI_TIMER) += sti-timer.o obj-$(CONFIG_STM32_TIMER) += stm32_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o obj-$(CONFIG_MTK_TIMER) += mtk_timer.o +obj-$(CONFIG_MCHP_PIT64B_TIMER) += mchp-pit64b-timer.o |