summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/btext.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-06-24 10:11:27 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-06-24 10:11:27 +0200
commit25bc694a8a086bfee6e5b9dd9e53f4de721b0acf (patch)
treea843d17b336c9ea7d4cad67843ebbf255d61ea1f /arch/powerpc/include/asm/btext.h
parent3e26c5feed2add218046ecf91bab3cfa9bf762a6 (diff)
parent000dd5316e1c756a1c028f22e01d06a38249dd4d (diff)
downloadlinux-25bc694a8a086bfee6e5b9dd9e53f4de721b0acf.tar.bz2
Merge back PCI power management material for v5.3.
Diffstat (limited to 'arch/powerpc/include/asm/btext.h')
-rw-r--r--arch/powerpc/include/asm/btext.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/btext.h b/arch/powerpc/include/asm/btext.h
index 3ffad030393c..461b0f193864 100644
--- a/arch/powerpc/include/asm/btext.h
+++ b/arch/powerpc/include/asm/btext.h
@@ -13,7 +13,11 @@ extern void btext_update_display(unsigned long phys, int width, int height,
int depth, int pitch);
extern void btext_setup_display(int width, int height, int depth, int pitch,
unsigned long address);
+#ifdef CONFIG_PPC32
extern void btext_prepare_BAT(void);
+#else
+static inline void btext_prepare_BAT(void) { }
+#endif
extern void btext_map(void);
extern void btext_unmap(void);