| Message ID | 1403388588-11956-1-git-send-email-robert.jarzmik@free.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Robert Jarzmik <robert.jarzmik@free.fr> writes: > Move time.c from arch/arm/mach-pxa/time.c to > drivers/clocksource/pxa_timer.c. > > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Ping ? Cheers. -- Robert
On Sun, Jun 22, 2014 at 6:09 AM, Robert Jarzmik <robert.jarzmik@free.fr> wrote: > Move time.c from arch/arm/mach-pxa/time.c to > drivers/clocksource/pxa_timer.c. > > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > --- > arch/arm/mach-pxa/Makefile | 2 +- > drivers/clocksource/Makefile | 1 + > arch/arm/mach-pxa/time.c => drivers/clocksource/pxa_timer.c | 0 > 3 files changed, 2 insertions(+), 1 deletion(-) > rename arch/arm/mach-pxa/time.c => drivers/clocksource/pxa_timer.c (100%) > > diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile > index 648867a..2fe1824 100644 > --- a/arch/arm/mach-pxa/Makefile > +++ b/arch/arm/mach-pxa/Makefile > @@ -4,7 +4,7 @@ > > # Common support (must be linked before board specific support) > obj-y += clock.o devices.o generic.o irq.o \ > - time.o reset.o > + reset.o > obj-$(CONFIG_PM) += pm.o sleep.o standby.o > > # Generic drivers that other drivers may depend upon > diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile > index 98cb6c5..e224125 100644 > --- a/drivers/clocksource/Makefile > +++ b/drivers/clocksource/Makefile > @@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o > obj-$(CONFIG_ARCH_MARCO) += timer-marco.o > obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o > obj-$(CONFIG_ARCH_MXS) += mxs_timer.o > +obj-$(CONFIG_ARCH_PXA) += pxa_timer.o > obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o > obj-$(CONFIG_ARCH_U300) += timer-u300.o > obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o > diff --git a/arch/arm/mach-pxa/time.c b/drivers/clocksource/pxa_timer.c > similarity index 100% > rename from arch/arm/mach-pxa/time.c > rename to drivers/clocksource/pxa_timer.c > -- > 2.0.0.rc2 > Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Acked for all these three patches. Regards Haojian
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 648867a..2fe1824 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -4,7 +4,7 @@ # Common support (must be linked before board specific support) obj-y += clock.o devices.o generic.o irq.o \ - time.o reset.o + reset.o obj-$(CONFIG_PM) += pm.o sleep.o standby.o # Generic drivers that other drivers may depend upon diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 98cb6c5..e224125 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o obj-$(CONFIG_ARCH_MARCO) += timer-marco.o obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o obj-$(CONFIG_ARCH_MXS) += mxs_timer.o +obj-$(CONFIG_ARCH_PXA) += pxa_timer.o obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o obj-$(CONFIG_ARCH_U300) += timer-u300.o obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o
Move time.c from arch/arm/mach-pxa/time.c to drivers/clocksource/pxa_timer.c. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> --- arch/arm/mach-pxa/Makefile | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-pxa/time.c => drivers/clocksource/pxa_timer.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm/mach-pxa/time.c => drivers/clocksource/pxa_timer.c (100%) diff --git a/arch/arm/mach-pxa/time.c b/drivers/clocksource/pxa_timer.c similarity index 100% rename from arch/arm/mach-pxa/time.c rename to drivers/clocksource/pxa_timer.c