| 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, 1 Dec 2011 13:16:04 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Tanmay Inamdar <tinamdar@....com>,
Josh Boyer <jwboyer@...il.com>, Paul Bolle <pebolle@...cali.nl>
Subject: linux-next: manual merge of the trivial tree with the 4xx tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/powerpc/platforms/40x/Kconfig between commit d5b9ee7b514e
("powerpc/40x: Add APM8018X SOC support") from the 4xx tree and commit
ff5f483f3091 ("powerpc: 4xx: remove commented out Kconfig entries") from
the trivial 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 arch/powerpc/platforms/40x/Kconfig
index 8883f2c,bd69cf8..0000000
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@@ -172,28 -148,3 +148,12 @@@ config IBM405_ERR7
# All 40x-based cores, up until the 405GPR and 405EP have this errata.
config IBM405_ERR51
bool
+
- #config BIOS_FIXUP
- # bool
- # depends on BUBINGA || EP405 || SYCAMORE || WALNUT
- # default y
-
- #config PPC4xx_DMA
- # bool "PPC4xx DMA controller support"
- # depends on 4xx
-
- #config PPC4xx_EDMA
- # bool
- # depends on !STB03xxx && PPC4xx_DMA
- # default y
- #
-
+config APM8018X
+ bool "APM8018X"
+ depends on 40x
+ default n
+ select PPC40x_SIMPLE
+ help
+ This option enables support for the AppliedMicro APM8018X evaluation
+ board.
-
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists