]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
MIPS: pic32mzda: Fix linker error for pic32_get_pbclk()
authorPurna Chandra Mandal <purna.mandal@microchip.com>
Thu, 2 Jun 2016 09:21:42 +0000 (14:51 +0530)
committerTim Gardner <tim.gardner@canonical.com>
Mon, 13 Mar 2017 21:20:54 +0000 (15:20 -0600)
BugLink: http://bugs.launchpad.net/bugs/1672544
commit a726f1d2dd4fee179aa4513176d688ad309de6cc upstream.

Early clock API pic32_get_pbclk() is defined in early_clk.c and used by
time.c and early_console.c. When CONFIG_EARLY_PRINTK isn't set,
early_clk.c isn't compiled and time.c fails to link.

Fix it by compiling early_clk.c always. Also sort files in alphabetical
order.

Fixes: 6e4ad1b41360 ("MIPS: pic32mzda: fix getting timer clock rate.")
Reported-by: Harvey Hunt <harvey.hunt@imgtec.com>
Signed-off-by: Purna Chandra Mandal <purna.mandal@microchip.com>
Reviewed-by: Harvey Hunt <harvey.hunt@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Joshua Henderson <digitalpeer@digitalpeer.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13383/
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
arch/mips/pic32/pic32mzda/Makefile

index 4a4c2728c02738e1850aedd3c63a4a0b0b125da9..c28649615c6cb36e8c172663d1f4c56d84c29905 100644 (file)
@@ -2,8 +2,7 @@
 # Joshua Henderson, <joshua.henderson@microchip.com>
 # Copyright (C) 2015 Microchip Technology, Inc.  All rights reserved.
 #
-obj-y                  := init.o time.o config.o
+obj-y                  := config.o early_clk.o init.o time.o
 
 obj-$(CONFIG_EARLY_PRINTK)     += early_console.o      \
-                                  early_pin.o          \
-                                  early_clk.o
+                                  early_pin.o