diff options
-rw-r--r-- | arch/arm/mach-pxa/Makefile | 2 | ||||
-rw-r--r-- | drivers/clocksource/Makefile | 1 | ||||
-rw-r--r-- | drivers/clocksource/pxa_timer.c (renamed from arch/arm/mach-pxa/time.c) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 648867a8caa8..2fe1824c6dcb 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | # Common support (must be linked before board specific support) | 5 | # Common support (must be linked before board specific support) |
6 | obj-y += clock.o devices.o generic.o irq.o \ | 6 | obj-y += clock.o devices.o generic.o irq.o \ |
7 | time.o reset.o | 7 | reset.o |
8 | obj-$(CONFIG_PM) += pm.o sleep.o standby.o | 8 | obj-$(CONFIG_PM) += pm.o sleep.o standby.o |
9 | 9 | ||
10 | # Generic drivers that other drivers may depend upon | 10 | # Generic drivers that other drivers may depend upon |
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index e40435d271d8..7fd9fd1dff42 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
@@ -20,6 +20,7 @@ obj-$(CONFIG_ARCH_CLPS711X) += clps711x-timer.o | |||
20 | obj-$(CONFIG_ARCH_MARCO) += timer-marco.o | 20 | obj-$(CONFIG_ARCH_MARCO) += timer-marco.o |
21 | obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o | 21 | obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o |
22 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o | 22 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o |
23 | obj-$(CONFIG_ARCH_PXA) += pxa_timer.o | ||
23 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o | 24 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o |
24 | obj-$(CONFIG_ARCH_U300) += timer-u300.o | 25 | obj-$(CONFIG_ARCH_U300) += timer-u300.o |
25 | obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o | 26 | obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o |
diff --git a/arch/arm/mach-pxa/time.c b/drivers/clocksource/pxa_timer.c index fca174e3865d..fca174e3865d 100644 --- a/arch/arm/mach-pxa/time.c +++ b/drivers/clocksource/pxa_timer.c | |||