diff options
| author | Purna Chandra Mandal <purna.mandal@microchip.com> | 2016-06-02 14:51:42 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 06:41:39 +0100 |
| commit | a8af2054e98548e8515f5d7d5409bd50dcd77e82 (patch) | |
| tree | 821d5fb76cf14879e63d00af1c8aad37c7290ce9 | |
| parent | 3737a5f7223464efed3b0a9da2b045dae28d3a53 (diff) | |
| download | linux-stable-a8af2054e98548e8515f5d7d5409bd50dcd77e82.tar.gz linux-stable-a8af2054e98548e8515f5d7d5409bd50dcd77e82.tar.bz2 linux-stable-a8af2054e98548e8515f5d7d5409bd50dcd77e82.zip | |
MIPS: pic32mzda: Fix linker error for pic32_get_pbclk()
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>
| -rw-r--r-- | arch/mips/pic32/pic32mzda/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/pic32/pic32mzda/Makefile b/arch/mips/pic32/pic32mzda/Makefile index 4a4c2728c027..c28649615c6c 100644 --- a/arch/mips/pic32/pic32mzda/Makefile +++ b/arch/mips/pic32/pic32mzda/Makefile @@ -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 |