diff options
| author | Jens Axboe <axboe@kernel.dk> | 2014-01-08 11:32:45 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2014-01-08 11:32:45 -0500 |
| commit | 54a387cb9e600256e50cb9e2209e7e4f06f464de (patch) | |
| tree | 37f2b32b1330f51dbe10ccf4300114c72f7aabdc /arch/arm/mach-omap2/omap_device.h | |
| parent | 8586ea96b4f919a9b38929040bc9ce57c9998fc4 (diff) | |
| parent | 0fec08b4ecfc36fd8a64432343b2964fb86d2675 (diff) | |
Merge branch 'for-3.14/core' into for-3.14/drivers
We need the updated code to make bcache easier to merge.
Diffstat (limited to 'arch/arm/mach-omap2/omap_device.h')
| -rw-r--r-- | arch/arm/mach-omap2/omap_device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h index 17ca1aec2710..78c02b355179 100644 --- a/arch/arm/mach-omap2/omap_device.h +++ b/arch/arm/mach-omap2/omap_device.h | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include "omap_hwmod.h" | 29 | #include "omap_hwmod.h" |
| 30 | 30 | ||
| 31 | extern struct dev_pm_domain omap_device_pm_domain; | 31 | extern struct dev_pm_domain omap_device_pm_domain; |
| 32 | extern struct dev_pm_domain omap_device_fail_pm_domain; | ||
| 32 | 33 | ||
| 33 | /* omap_device._state values */ | 34 | /* omap_device._state values */ |
| 34 | #define OMAP_DEVICE_STATE_UNKNOWN 0 | 35 | #define OMAP_DEVICE_STATE_UNKNOWN 0 |