diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:00:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:01:01 +0200 |
commit | 40a0c68ca9b49fb3e7292c1bae035ba5bcb27903 (patch) | |
tree | 11682834d3442d4640c4464709a76a268869ffbd /arch/powerpc/platforms/powernv/powernv.h | |
parent | c61037e905a5cb74c7d786c35ee2cdbab9ed63af (diff) | |
parent | 7e3115ef5149fc502e3a2e80719dba54a8e7409d (diff) |
Merge branch 'sched/urgent' into sched/core
Merge in the latest fixes before applying a dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/platforms/powernv/powernv.h')
-rw-r--r-- | arch/powerpc/platforms/powernv/powernv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/powernv.h b/arch/powerpc/platforms/powernv/powernv.h index a1c6f83fc39..de6819be1f9 100644 --- a/arch/powerpc/platforms/powernv/powernv.h +++ b/arch/powerpc/platforms/powernv/powernv.h @@ -15,4 +15,6 @@ static inline void pnv_pci_init(void) { } static inline void pnv_pci_shutdown(void) { } #endif +extern void pnv_lpc_init(void); + #endif /* _POWERNV_H */ |