diff options
author | Nathan Fontenot <nfont@linux.vnet.ibm.com> | 2012-10-02 12:59:39 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 20:56:55 -0500 |
commit | f459d63e1689b16a2f5a965557e19b25bad5dbdc (patch) | |
tree | 1b9c88dd57fe3b43bd1d3bf1227cb391f298883e /arch/powerpc/include/asm/rtas.h | |
parent | 79d1c712958f94372482ad74578b00f44e744c12 (diff) |
powerpc+of: Remove the pSeries_reconfig.h file
Remove the pSeries_reconfig.h header file. At this point there is only one
definition in the file, pSeries_coalesce_init(), which can be
moved to rtas.h.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/rtas.h')
-rw-r--r-- | arch/powerpc/include/asm/rtas.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h index 557cff845dee..aef00c675905 100644 --- a/arch/powerpc/include/asm/rtas.h +++ b/arch/powerpc/include/asm/rtas.h | |||
@@ -353,8 +353,13 @@ static inline int page_is_rtas_user_buf(unsigned long pfn) | |||
353 | return 1; | 353 | return 1; |
354 | return 0; | 354 | return 0; |
355 | } | 355 | } |
356 | |||
357 | /* Not the best place to put pSeries_coalesce_init, will be fixed when we | ||
358 | * move some of the rtas suspend-me stuff to pseries */ | ||
359 | extern void pSeries_coalesce_init(void); | ||
356 | #else | 360 | #else |
357 | static inline int page_is_rtas_user_buf(unsigned long pfn) { return 0;} | 361 | static inline int page_is_rtas_user_buf(unsigned long pfn) { return 0;} |
362 | static inline void pSeries_coalesce_init(void) { } | ||
358 | #endif | 363 | #endif |
359 | 364 | ||
360 | extern int call_rtas(const char *, int, int, unsigned long *, ...); | 365 | extern int call_rtas(const char *, int, int, unsigned long *, ...); |