summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-26 21:34:42 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-26 21:34:42 +0100
commit8e22e1b3499a446df48c2b26667ca36c55bf864c (patch)
tree5329f98b3eb3c95a9dcbab0fa4f9b6e62f0e788d /lib
parent00d3c14f14d51babd8aeafd5fa734ccf04f5ca3d (diff)
parent64a577196d66b44e37384bc5c4d78c61f59d5b2a (diff)
Merge airlied/drm-next into drm-misc-next
Backmerge the main pull request to sync up with all the newly landed drivers. Otherwise we'll have chaos even before 4.12 started in earnest. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 1788a1f50d28..f4193a3d9301 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -551,7 +551,7 @@ config SBITMAP
bool
config PRIME_NUMBERS
- tristate "Prime number generator"
+ tristate
default n
help
Provides a helper module to generate prime numbers. Useful for writing