diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/linux/platform_device.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 4b8cc6a32479..9a342699c607 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
| @@ -55,7 +55,6 @@ struct platform_driver { | |||
| 55 | int (*suspend_late)(struct platform_device *, pm_message_t state); | 55 | int (*suspend_late)(struct platform_device *, pm_message_t state); |
| 56 | int (*resume_early)(struct platform_device *); | 56 | int (*resume_early)(struct platform_device *); |
| 57 | int (*resume)(struct platform_device *); | 57 | int (*resume)(struct platform_device *); |
| 58 | struct pm_ext_ops *pm; | ||
| 59 | struct device_driver driver; | 58 | struct device_driver driver; |
| 60 | }; | 59 | }; |
| 61 | 60 | ||