From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 9 Nov 2011 01:16:50 +0000 (+1100)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20111109~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2784dfb834ae24f56c05646457436c85dcfa1d18;p=karo-tx-linux.git

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

2784dfb834ae24f56c05646457436c85dcfa1d18
diff --cc lib/Kconfig
index 32f3e5ae2be5,abff69d4ff88..d971366b8de2
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -270,10 -270,12 +270,9 @@@ 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 LLIST
 -	bool
 -
  endmenu