diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
| commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
| tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /include/linux/platform_device.h | |
| parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index ce8e4ffd78c7..16f6654082dd 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
| @@ -178,6 +178,7 @@ struct platform_driver { | |||
| 178 | int (*resume)(struct platform_device *); | 178 | int (*resume)(struct platform_device *); |
| 179 | struct device_driver driver; | 179 | struct device_driver driver; |
| 180 | const struct platform_device_id *id_table; | 180 | const struct platform_device_id *id_table; |
| 181 | bool prevent_deferred_probe; | ||
| 181 | }; | 182 | }; |
| 182 | 183 | ||
| 183 | #define to_platform_driver(drv) (container_of((drv), struct platform_driver, \ | 184 | #define to_platform_driver(drv) (container_of((drv), struct platform_driver, \ |