summaryrefslogtreecommitdiff
path: root/lib/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-11-13 23:55:35 +0400
committerJiri Kosina <jkosina@suse.cz>2011-11-13 23:55:53 +0400
commit2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch)
treee075e4d5534193f28e6059904f61e5ca03958d3c /lib/Kconfig
parent4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff)
parent52e4c2a05256cb83cda12f3c2137ab1533344edb (diff)
downloadlinux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.tar.xz
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'lib/Kconfig')
-rw-r--r--lib/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index abff69d4ff88..d971366b8de2 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -275,7 +275,4 @@ config CORDIC
This option provides an implementation of the CORDIC algorithm;
calculations are in fixed point. Module will be called cordic.
-config LLIST
- bool
-
endmenu