From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Dec 2011 04:01:20 +0000 (+1100)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20111219~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=851144a135181c0bd9248b70fae2f751043bee8a;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	arch/powerpc/platforms/40x/Kconfig
---

851144a135181c0bd9248b70fae2f751043bee8a
diff --cc arch/powerpc/platforms/40x/Kconfig
index baae85584b1c,bd69cf8d8222..a392d12dd21f
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@@ -182,28 -148,3 +158,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.
- 
diff --cc lib/Kconfig
index c084cdc385ad,d971366b8de2..f3edf1471573
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -273,35 -270,9 +273,34 @@@ config AVERAG
  	  If unsure, say N.
  
  config CORDIC
- 	tristate "Cordic function"
+ 	tristate "CORDIC algorithm"
  	help
- 	  The option provides arithmetic function using cordic algorithm
- 	  so its calculations are in fixed point. Modules can select this
- 	  when they require this function. Module will be called cordic.
+ 	  This option provides an implementation of the CORDIC algorithm;
+ 	  calculations are in fixed point. Module will be called cordic.
  
 +config MPILIB
 +	tristate "Multiprecision maths library"
 +	help
 +	  Multiprecision maths library from GnuPG.
 +	  It is used to implement RSA digital signature verification,
 +	  which is used by IMA/EVM digital signature extension.
 +
 +config MPILIB_EXTRA
 +	bool "Multiprecision maths library - additional sources"
 +	depends on MPILIB
 +	help
 +	  Multiprecision maths library from GnuPG.
 +	  It is used to implement RSA digital signature verification,
 +	  which is used by IMA/EVM digital signature extension.
 +	  This code in unnecessary for RSA digital signature verification,
 +	  and can be compiled if needed.
 +
 +config DIGSIG
 +	tristate "In-kernel signature checker"
 +	depends on KEYS
 +	select MPILIB
 +	help
 +	  Digital signature verification. Currently only RSA is supported.
 +	  Implementation is done using GnuPG MPI library
 +
  endmenu