diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:57:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:57:37 -0400 |
| commit | 6fd03301d76bc439382710e449f58efbb233df1b (patch) | |
| tree | 3c8a3217aed67319683ffc1debccdb5b3245b16c /init | |
| parent | cd5232bd6be2d215a800f3d88c287ca791debfbe (diff) | |
| parent | e4792aa30f9d33584d7192685ed149cc5fee737f (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: (64 commits)
debugfs: use specified mode to possibly mark files read/write only
debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
xen: remove driver_data direct access of struct device from more drivers
usb: gadget: at91_udc: remove driver_data direct access of struct device
uml: remove driver_data direct access of struct device
block/ps3: remove driver_data direct access of struct device
s390: remove driver_data direct access of struct device
parport: remove driver_data direct access of struct device
parisc: remove driver_data direct access of struct device
of_serial: remove driver_data direct access of struct device
mips: remove driver_data direct access of struct device
ipmi: remove driver_data direct access of struct device
infiniband: ehca: remove driver_data direct access of struct device
ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
hvcs: remove driver_data direct access of struct device
xen block: remove driver_data direct access of struct device
thermal: remove driver_data direct access of struct device
scsi: remove driver_data direct access of struct device
pcmcia: remove driver_data direct access of struct device
PCIE: remove driver_data direct access of struct device
...
Manually fix up trivial conflicts due to different direct driver_data
direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index fed6dc31b0da..c4b3c6d51a72 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -616,13 +616,13 @@ config SYSFS_DEPRECATED | |||
| 616 | bool | 616 | bool |
| 617 | 617 | ||
| 618 | config SYSFS_DEPRECATED_V2 | 618 | config SYSFS_DEPRECATED_V2 |
| 619 | bool "Create deprecated sysfs layout for older userspace tools" | 619 | bool "remove sysfs features which may confuse old userspace tools" |
| 620 | depends on SYSFS | 620 | depends on SYSFS |
| 621 | default y | 621 | default n |
| 622 | select SYSFS_DEPRECATED | 622 | select SYSFS_DEPRECATED |
| 623 | help | 623 | help |
| 624 | This option switches the layout of sysfs to the deprecated | 624 | This option switches the layout of sysfs to the deprecated |
| 625 | version. | 625 | version. Do not use it on recent distributions. |
| 626 | 626 | ||
| 627 | The current sysfs layout features a unified device tree at | 627 | The current sysfs layout features a unified device tree at |
| 628 | /sys/devices/, which is able to express a hierarchy between | 628 | /sys/devices/, which is able to express a hierarchy between |