diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-15 18:04:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-15 18:04:38 -0700 |
commit | 9e1a0aab60b3d4a6650690862153f11fceddb80d (patch) | |
tree | 617a11ad0ae931328af5d0f9f110f6218c15457b /init/Kconfig | |
parent | 5cd8846c3b7c104135ee602ab1887f4c1de445ef (diff) | |
parent | 3d374d09f16f64ab4d71704cbe621514d36cd0b1 (diff) |
Merge tag 'char-misc-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg Kroah-Hartman:
"Here are some tiny fixes for the w1 drivers and the final removal
patch for getting rid of CONFIG_EXPERIMENTAL (all users of it are now
gone from your tree, this just drops the Kconfig item itself.)
All have been in the linux-next tree for a while"
* tag 'char-misc-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
final removal of CONFIG_EXPERIMENTAL
w1: fix oops when w1_search is called from netlink connector
w1-gpio: fix unused variable warning
w1-gpio: remove erroneous __exit and __exit_p()
ARM: w1-gpio: fix erroneous gpio requests
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 22616cd434b..5341d7232c3 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -28,10 +28,6 @@ config BUILDTIME_EXTABLE_SORT menu "General setup" -config EXPERIMENTAL - bool - default y - config BROKEN bool |