| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 15 Mar 2012 13:23:52 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dave Jones <davej@...hat.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Russell King <rmk+kernel@....linux.org.uk>,
Kevin Hilman <khilman@...com>,
Jaecheol Lee <jc.lee@...sung.com>,
Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the cpufreq tree with the
cpufreq-current tree
Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
drivers/cpufreq/Makefile between commit b09db45c56c2 ("cpufreq: OMAP
driver depends CPUfreq tables") from the cpufreq-current tree and commit
a35c50510dd4 ("EXYNOS4X12: Add support cpufreq for EXYNOS4X12") from the
cpufreq tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/cpufreq/Makefile
index fda94c7,3cbbcd0..0000000
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@@ -44,7 -45,9 +45,9 @@@ obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3
obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o
+ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o
+ obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o
-obj-$(CONFIG_ARCH_OMAP2PLUS) += omap-cpufreq.o
+obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o
##################################################################################
# PowerPC platform drivers
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists