diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 13:49:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 13:49:31 -0400 |
commit | 0016effb90589a87290a2ee721e34dc37e87b67c (patch) | |
tree | 6e52adab5fd775a62edfad7f373916b8d1b31ba6 /lib | |
parent | 93b49d45eb97574057ee03dfdd590c209f5132f8 (diff) | |
parent | e67c85626cd02e306da1b4195bfaf68d61050796 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
Revert driver core: move platform_data into platform_device
Revert driver core: fix passing platform_data
Remove old PRINTK_DEBUG config item
Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense
Driver core: platform: fix kernel-doc warnings
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig.debug | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 812c28207baf..6cdcf38f2da9 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -891,7 +891,6 @@ config DYNAMIC_DEBUG | |||
891 | default n | 891 | default n |
892 | depends on PRINTK | 892 | depends on PRINTK |
893 | depends on DEBUG_FS | 893 | depends on DEBUG_FS |
894 | select PRINTK_DEBUG | ||
895 | help | 894 | help |
896 | 895 | ||
897 | Compiles debug level messages into the kernel, which would not | 896 | Compiles debug level messages into the kernel, which would not |