diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:05:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:05:40 -0400 |
| commit | a5e6b135bdff649e4330f98e2e80dbb1984f7e77 (patch) | |
| tree | 475bfb1163c59d1370fd77415255afba768f9520 /init | |
| parent | 971f115a50afbe409825c9f3399d5a3b9aca4381 (diff) | |
| parent | 9d90c8d9cde929cbc575098e825d7c29d9f45054 (diff) | |
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits)
printk: do not mangle valid userspace syslog prefixes
efivars: Add Documentation
efivars: Expose efivars functionality to external drivers.
efivars: Parameterize operations.
efivars: Split out variable registration
efivars: parameterize efivars
efivars: Make efivars bin_attributes dynamic
efivars: move efivars globals into struct efivars
drivers:misc: ti-st: fix debugging code
kref: Fix typo in kref documentation
UIO: add PRUSS UIO driver support
Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches
firmware: Fix unaligned memory accesses in dmi-sysfs
firmware: Add documentation for /sys/firmware/dmi
firmware: Expose DMI type 15 System Event Log
firmware: Break out system_event_log in dmi-sysfs
firmware: Basic dmi-sysfs support
firmware: Add DMI entry types to the headers
Driver core: convert platform_{get,set}_drvdata to static inline functions
Translate linux-2.6/Documentation/magic-number.txt into Chinese
...
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 5721d27af626..6f49ceb25710 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -836,7 +836,7 @@ config MM_OWNER | |||
| 836 | bool | 836 | bool |
| 837 | 837 | ||
| 838 | config SYSFS_DEPRECATED | 838 | config SYSFS_DEPRECATED |
| 839 | bool "enable deprecated sysfs features to support old userspace tools" | 839 | bool "Enable deprecated sysfs features to support old userspace tools" |
| 840 | depends on SYSFS | 840 | depends on SYSFS |
| 841 | default n | 841 | default n |
| 842 | help | 842 | help |
| @@ -859,7 +859,7 @@ config SYSFS_DEPRECATED | |||
| 859 | need to say Y here. | 859 | need to say Y here. |
| 860 | 860 | ||
| 861 | config SYSFS_DEPRECATED_V2 | 861 | config SYSFS_DEPRECATED_V2 |
| 862 | bool "enabled deprecated sysfs features by default" | 862 | bool "Enable deprecated sysfs features by default" |
| 863 | default n | 863 | default n |
| 864 | depends on SYSFS | 864 | depends on SYSFS |
| 865 | depends on SYSFS_DEPRECATED | 865 | depends on SYSFS_DEPRECATED |