diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 21:04:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 21:04:48 -0400 |
commit | 5b339915762d30b21995aa7263e74081f2f1110a (patch) | |
tree | 4e076dbd27025054b21dddd78a1cb3fef3de34d7 /drivers/base/power/shutdown.c | |
parent | 89661adaaee2f85116b399e642129ccd4dafd195 (diff) | |
parent | 823bccfc4002296ba88c3ad0f049e1abd8108d30 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
remove "struct subsystem" as it is no longer needed
sysfs: printk format warning
DOC: Fix wrong identifier name in Documentation/driver-model/devres.txt
platform: reorder platform_device_del
Driver core: fix show_uevent from taking up way too much stack
Diffstat (limited to 'drivers/base/power/shutdown.c')
-rw-r--r-- | drivers/base/power/shutdown.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c index 58b6f77a1b34..a47ee1b70d20 100644 --- a/drivers/base/power/shutdown.c +++ b/drivers/base/power/shutdown.c | |||
@@ -16,8 +16,6 @@ | |||
16 | 16 | ||
17 | #define to_dev(node) container_of(node, struct device, kobj.entry) | 17 | #define to_dev(node) container_of(node, struct device, kobj.entry) |
18 | 18 | ||
19 | extern struct subsystem devices_subsys; | ||
20 | |||
21 | 19 | ||
22 | /** | 20 | /** |
23 | * We handle system devices differently - we suspend and shut them | 21 | * We handle system devices differently - we suspend and shut them |
@@ -36,7 +34,7 @@ void device_shutdown(void) | |||
36 | { | 34 | { |
37 | struct device * dev, *devn; | 35 | struct device * dev, *devn; |
38 | 36 | ||
39 | list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.kset.list, | 37 | list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.list, |
40 | kobj.entry) { | 38 | kobj.entry) { |
41 | if (dev->bus && dev->bus->shutdown) { | 39 | if (dev->bus && dev->bus->shutdown) { |
42 | dev_dbg(dev, "shutdown\n"); | 40 | dev_dbg(dev, "shutdown\n"); |