diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-16 04:09:42 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-16 04:09:42 -0500 |
| commit | a02056349cdea2252cd2b21643ebf025e83a29f2 (patch) | |
| tree | b7c889d6cbe8e7188d07d99a5c9da858c53a5b6c /include/linux/platform_device.h | |
| parent | 34db1d595ef6f183fbc1e42cda45a3dfa0035258 (diff) | |
| parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 (diff) | |
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index d7ecad0093bb..2e700ec0601f 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
| @@ -138,6 +138,9 @@ extern struct platform_device *platform_create_bundle(struct platform_driver *dr | |||
| 138 | struct resource *res, unsigned int n_res, | 138 | struct resource *res, unsigned int n_res, |
| 139 | const void *data, size_t size); | 139 | const void *data, size_t size); |
| 140 | 140 | ||
| 141 | extern const struct dev_pm_ops * platform_bus_get_pm_ops(void); | ||
| 142 | extern void platform_bus_set_pm_ops(const struct dev_pm_ops *pm); | ||
| 143 | |||
| 141 | /* early platform driver interface */ | 144 | /* early platform driver interface */ |
| 142 | struct early_platform_driver { | 145 | struct early_platform_driver { |
| 143 | const char *class_str; | 146 | const char *class_str; |