diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 06:30:24 -0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 06:42:13 -0400 |
| commit | a614e1923d5389d01f3545ee4a90e39a04d0c90d (patch) | |
| tree | e8e32dba12a66ffd26d78f015a142ac28e19ad8e /arch/arm/mach-omap2/common.h | |
| parent | f53f292eeaa234615c31a1306babe703fc4263f2 (diff) | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
Merge tag 'v3.9' into efi-for-tip2
Resolve conflicts for Ingo.
Conflicts:
drivers/firmware/Kconfig
drivers/firmware/efivars.c
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 40f4a03d728f..d6ba13e1c540 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
| @@ -293,5 +293,8 @@ extern void omap_reserve(void); | |||
| 293 | struct omap_hwmod; | 293 | struct omap_hwmod; |
| 294 | extern int omap_dss_reset(struct omap_hwmod *); | 294 | extern int omap_dss_reset(struct omap_hwmod *); |
| 295 | 295 | ||
| 296 | /* SoC specific clock initializer */ | ||
| 297 | extern int (*omap_clk_init)(void); | ||
| 298 | |||
| 296 | #endif /* __ASSEMBLER__ */ | 299 | #endif /* __ASSEMBLER__ */ |
| 297 | #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ | 300 | #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ |