diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 14:44:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 14:44:19 -0400 |
| commit | fc76a258d41eea7953bb763397c3d1e589d3bb98 (patch) | |
| tree | ef8c4b828f3011adf9fc9ef976b9d07c35628e81 /arch/sparc | |
| parent | fe3c22bd5cadd8e36977b218b27fbea821381ec8 (diff) | |
| parent | bfd63cd24df69120585c22e09fda78723772ee2a (diff) | |
Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH:
"Here's the big driver core merge for 3.11-rc1
Lots of little things, and larger firmware subsystem updates, all
described in the shortlog. Nice thing here is that we finally get rid
of CONFIG_HOTPLUG, after 10+ years, thanks to Stephen Rohtwell (it had
been always on for a number of kernel releases, now it's just
removed)"
* tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (27 commits)
driver core: device.h: fix doc compilation warnings
firmware loader: fix another compile warning with PM_SLEEP unset
build some drivers only when compile-testing
firmware loader: fix compile warning with PM_SLEEP set
kobject: sanitize argument for format string
sysfs_notify is only possible on file attributes
firmware loader: simplify holding module for request_firmware
firmware loader: don't export cache_firmware and uncache_firmware
drivers/base: Use attribute groups to create sysfs memory files
firmware loader: fix compile warning
firmware loader: fix build failure with !CONFIG_FW_LOADER_USER_HELPER
Documentation: Updated broken link in HOWTO
Finally eradicate CONFIG_HOTPLUG
driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend
driver core: firmware loader: don't cache FW_ACTION_NOHOTPLUG firmware
Documentation: Tidy up some drivers/base/core.c kerneldoc content.
platform_device: use a macro instead of platform_driver_register
firmware: move EXPORT_SYMBOL annotations
firmware: Avoid deadlock of usermodehelper lock at shutdown
dell_rbu: Select CONFIG_FW_LOADER_USER_HELPER explicitly
...
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 9ac9f1666339..a00cbd356db5 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -243,7 +243,6 @@ config SECCOMP | |||
| 243 | config HOTPLUG_CPU | 243 | config HOTPLUG_CPU |
| 244 | bool "Support for hot-pluggable CPUs" | 244 | bool "Support for hot-pluggable CPUs" |
| 245 | depends on SPARC64 && SMP | 245 | depends on SPARC64 && SMP |
| 246 | select HOTPLUG | ||
| 247 | help | 246 | help |
| 248 | Say Y here to experiment with turning CPUs off and on. CPUs | 247 | Say Y here to experiment with turning CPUs off and on. CPUs |
| 249 | can be controlled through /sys/devices/system/cpu/cpu#. | 248 | can be controlled through /sys/devices/system/cpu/cpu#. |