diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/device.h | 3 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 7f63d4de5c4d..eb1fff0b1d2a 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -80,6 +80,7 @@ struct bus_type { | |||
80 | int (*resume)(struct device * dev); | 80 | int (*resume)(struct device * dev); |
81 | 81 | ||
82 | unsigned int drivers_autoprobe:1; | 82 | unsigned int drivers_autoprobe:1; |
83 | unsigned int multithread_probe:1; | ||
83 | }; | 84 | }; |
84 | 85 | ||
85 | extern int __must_check bus_register(struct bus_type * bus); | 86 | extern int __must_check bus_register(struct bus_type * bus); |
@@ -139,8 +140,6 @@ struct device_driver { | |||
139 | void (*shutdown) (struct device * dev); | 140 | void (*shutdown) (struct device * dev); |
140 | int (*suspend) (struct device * dev, pm_message_t state); | 141 | int (*suspend) (struct device * dev, pm_message_t state); |
141 | int (*resume) (struct device * dev); | 142 | int (*resume) (struct device * dev); |
142 | |||
143 | unsigned int multithread_probe:1; | ||
144 | }; | 143 | }; |
145 | 144 | ||
146 | 145 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index 481ea0663f19..a3ad76221c6f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -361,8 +361,6 @@ struct pci_driver { | |||
361 | struct pci_error_handlers *err_handler; | 361 | struct pci_error_handlers *err_handler; |
362 | struct device_driver driver; | 362 | struct device_driver driver; |
363 | struct pci_dynids dynids; | 363 | struct pci_dynids dynids; |
364 | |||
365 | int multithread_probe; | ||
366 | }; | 364 | }; |
367 | 365 | ||
368 | #define to_pci_driver(drv) container_of(drv,struct pci_driver, driver) | 366 | #define to_pci_driver(drv) container_of(drv,struct pci_driver, driver) |