Messages in this thread Patch in this message | | | Subject | [PATCH 13/13] fix ps3fb glue allowing a modular build | From | Al Viro <> | Date | Wed, 14 Mar 2007 09:17:04 +0000 |
| |
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- arch/powerpc/platforms/ps3/htab.c | 2 ++ drivers/video/Kconfig | 2 +- include/asm-powerpc/ps3fb.h | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index e12e59f..67d6f58 100644 --- a/arch/powerpc/platforms/ps3/htab.c +++ b/arch/powerpc/platforms/ps3/htab.c @@ -235,7 +235,9 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long va, static void ps3_hpte_clear(void) { /* Make sure to clean up the frame buffer device first */ +#ifdef CONFIG_PS3_FB ps3fb_cleanup(); +#endif lv1_unmap_htab(htab_addr); } diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7f5a598..ab43a32 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1615,7 +1615,7 @@ config FB_IBM_GXT4500 adaptor, found on some IBM System P (pSeries) machines. config FB_PS3 - bool "PS3 GPU framebuffer driver" + tristate "PS3 GPU framebuffer driver" depends on FB && PS3_PS3AV select FB_CFB_FILLRECT select FB_CFB_COPYAREA diff --git a/include/asm-powerpc/ps3fb.h b/include/asm-powerpc/ps3fb.h index ad81cf4..a447387 100644 --- a/include/asm-powerpc/ps3fb.h +++ b/include/asm-powerpc/ps3fb.h @@ -43,13 +43,8 @@ struct ps3fb_ioctl_res { #ifdef __KERNEL__ -#ifdef CONFIG_FB_PS3 extern void ps3fb_flip_ctl(int on); extern void ps3fb_cleanup(void); -#else -static inline void ps3fb_flip_ctl(int on) {} -static inline void ps3fb_cleanup(void) {} -#endif #endif /* __KERNEL__ */ -- 1.5.0-rc2.GIT - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |