diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-21 23:00:41 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-21 23:00:41 -0700 |
commit | 8437de04d1475ee4af43a217ac2ca74eb9f58ad1 (patch) | |
tree | b8481a64ea0bcb0a6b2f8d27f0c26e39726f0a03 /arch/arm/Makefile | |
parent | 3aec092eed5d8d2b19a62b0aeed3acea9471099a (diff) | |
parent | 13acc291191281e2980e56dbe3a3d80ce677c9a8 (diff) | |
download | op-kernel-dev-8437de04d1475ee4af43a217ac2ca74eb9f58ad1.zip op-kernel-dev-8437de04d1475ee4af43a217ac2ca74eb9f58ad1.tar.gz |
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
Misc SoC-related fixes/cleanups for Samsung platforms
* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Add check for NULL in clock interface
ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state
ARM: EXYNOS: Add bus clock for FIMD
ARM: SAMSUNG: Fix HDMI related warnings
ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock
ARM: EXYNOS: Fix incorrect help text
ARM: EXYNOS: Turn off clocks for NAND, OneNAND and TSI controllers
+ sync to 3.6-rc6
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 17b0d5f..e9fde91 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -285,10 +285,10 @@ zImage Image xipImage bootpImage uImage: vmlinux zinstall uinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ -%.dtb: +%.dtb: scripts $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ -dtbs: +dtbs: scripts $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ # We use MRPROPER_FILES and CLEAN_FILES now |