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 /include/linux/pci_hotplug.h | |
| 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 'include/linux/pci_hotplug.h')
| -rw-r--r-- | include/linux/pci_hotplug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index a675a05c4091..ab4cb6ecd47c 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h | |||
| @@ -174,7 +174,7 @@ extern int pci_hp_register (struct hotplug_slot *slot); | |||
| 174 | extern int pci_hp_deregister (struct hotplug_slot *slot); | 174 | extern int pci_hp_deregister (struct hotplug_slot *slot); |
| 175 | extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot, | 175 | extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot, |
| 176 | struct hotplug_slot_info *info); | 176 | struct hotplug_slot_info *info); |
| 177 | extern struct subsystem pci_hotplug_slots_subsys; | 177 | extern struct kset pci_hotplug_slots_subsys; |
| 178 | 178 | ||
| 179 | /* PCI Setting Record (Type 0) */ | 179 | /* PCI Setting Record (Type 0) */ |
| 180 | struct hpp_type0 { | 180 | struct hpp_type0 { |