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 /Documentation | |
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 'Documentation')
-rw-r--r-- | Documentation/sysfs-rules.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt index 6049a2a84dda..5d8bc2cd250c 100644 --- a/Documentation/sysfs-rules.txt +++ b/Documentation/sysfs-rules.txt | |||
@@ -113,7 +113,7 @@ versions of the sysfs interface. | |||
113 | "devices" directory at /sys/subsystem/<name>/devices. | 113 | "devices" directory at /sys/subsystem/<name>/devices. |
114 | 114 | ||
115 | If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be | 115 | If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be |
116 | ignored. If it does not exist, you have always to scan all three | 116 | ignored. If it does not exist, you always have to scan all three |
117 | places, as the kernel is free to move a subsystem from one place to | 117 | places, as the kernel is free to move a subsystem from one place to |
118 | the other, as long as the devices are still reachable by the same | 118 | the other, as long as the devices are still reachable by the same |
119 | subsystem name. | 119 | subsystem name. |