diff options
author | Olof Johansson <olof@lixom.net> | 2015-08-05 10:53:52 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-08-05 10:53:52 +0200 |
commit | b69354dfe25bf0b103ef3ed6c881d34cc442265c (patch) | |
tree | 7bb912aa103d1501c9e67457cab8b761e175aba0 /drivers/clk | |
parent | c268a743103aebba8d81d3365107f7170653099e (diff) | |
parent | e4a9288942392965bd5cfad93d9996b83c0dc4a6 (diff) | |
download | linux-b69354dfe25bf0b103ef3ed6c881d34cc442265c.tar.bz2 |
Merge tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/soc
arm: Xilinx Zynq SoC patches for v4.2
- Fix earlyprintk, jump trampoline for SMP
- Update git tree location
- Setup PL310 aux (bit 22)
* tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: reserve space for jump target in secondary trampoline
clk: zynq: remove redundant $(CONFIG_ARCH_ZYNQ) in Makefile
MAINTAINERS: Update Zynq git tree location
ARM: zynq: Set bit 22 in PL310 AuxCtrl register (6395/1)
ARM: zynq: Fix earlyprintk in big endian mode
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/zynq/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/zynq/Makefile b/drivers/clk/zynq/Makefile index 156d923f4fa9..0afc2e7cc5c1 100644 --- a/drivers/clk/zynq/Makefile +++ b/drivers/clk/zynq/Makefile @@ -1,3 +1,3 @@ # Zynq clock specific Makefile -obj-$(CONFIG_ARCH_ZYNQ) += clkc.o pll.o +obj-y += clkc.o pll.o |