atyfb: Fix kconfig error

PATCH In review Antonino A. Daplas 2 participants 2 messages Feb 26, 2007 – Mar 3, 2007 Framebuffer layer

lore

Share & tools

lore

Antonino A. Daplas

author

2007-02-26 21:51 UTC #0 lore raw

PATCH 1/1 atyfb: Fix kconfig error

Fix the following compile error:

MODPOST 327 modules
WARNING: "aty_st_lcd" [drivers/video/aty/atyfb.ko] undefined!
WARNING: "aty_ld_lcd" [drivers/video/aty/atyfb.ko] undefined! make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

Signed-off-by Antonino Daplas <[email protected]>

---

 drivers/video/aty/atyfb_base.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

drivers/video/aty/atyfb_base.c +2 -1

index 56b38f5..9ebc4a0 100644
@@ -131,7 +131,8 @@ #endif
 #define PRINTKI(fmt, args...)	printk(KERN_INFO "atyfb: " fmt, ## args)
 #define PRINTKE(fmt, args...)	 printk(KERN_ERR "atyfb: " fmt, ## args)
 
-#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD)
+#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || \
+defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
 static const u32 lt_lcd_regs[] = {
 	CONFIG_PANEL_LG,
 	LCD_GEN_CNTL_LG,

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Randy Dunlap

2007-03-03 02:34 UTC #1 lore raw

Quoted 19 lines · On Tue, 27 Feb 2007 05:52:56 +0800 Antonino A. Daplas wrote:

Fix the following compile error:
MODPOST 327 modules
WARNING: "aty_st_lcd" [drivers/video/aty/atyfb.ko] undefined!
WARNING: "aty_ld_lcd" [drivers/video/aty/atyfb.ko] undefined! make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
Signed-off-by Antonino Daplas <[email protected]>
---
 drivers/video/aty/atyfb_base.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/video/aty/atyfb_base.c +0 -0
index 56b38f5..9ebc4a0 100644

drivers/video/aty/atyfb_base.c #endif · line 138

Quoted 9 lines

drivers/video/aty/atyfb_base.c +2 -1

@@ -131,7 +131,8 @@ #endif
 #define PRINTKI(fmt, args...)	printk(KERN_INFO "atyfb: " fmt, ## args)
 #define PRINTKE(fmt, args...)	 printk(KERN_ERR "atyfb: " fmt, ## args)
 
-#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD)
+#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || \
+defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
 static const u32 lt_lcd_regs[] = {
 	CONFIG_PANEL_LG,
 	LCD_GEN_CNTL_LG,

Hm, I did a version of this patch, but I did that change in atyfb.h also, due to missing (implicit) declaration warnings as well.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

From: Randy Dunlap <[email protected]>

Fix implicit declarations and missing code in atyfb.

drivers/video/aty/atyfb_base.c:2137: warning: implicit declaration of function 'a ty_ld_lcd'
drivers/video/aty/atyfb_base.c:2154: warning: implicit declaration of function 'a ty_st_lcd'
atyfb_base.c:(.text+0x33e5c): undefined reference to aty_ld_lcd' atyfb_base.c:(.text+0x33eb2): undefined reference to aty_st_lcd'

Signed-off-by Randy Dunlap <[email protected]>

---
 drivers/video/aty/atyfb.h      |    2 +-
 drivers/video/aty/atyfb_base.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/video/aty/atyfb.h +1 -1

@@ -284,7 +284,7 @@ static inline void aty_st_8(int regindex
 #endif
 }
 
-#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD)
+#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
 extern void aty_st_lcd(int index, u32 val, const struct atyfb_par *par);
 extern u32 aty_ld_lcd(int index, const struct atyfb_par *par);
 #endif

drivers/video/aty/atyfb_base.c +2 -2

@@ -131,7 +131,7 @@
 #define PRINTKI(fmt, args...)	printk(KERN_INFO "atyfb: " fmt, ## args)
 #define PRINTKE(fmt, args...)	 printk(KERN_ERR "atyfb: " fmt, ## args)
 
-#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD)
+#if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
 static const u32 lt_lcd_regs[] = {
 	CONFIG_PANEL_LG,
 	LCD_GEN_CNTL_LG,

@@ -173,7 +173,7 @@ u32 aty_ld_lcd(int index, const struct a
 		return aty_ld_le32(LCD_DATA, par);
 	}
 }
-#endif /* defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD) */
+#endif /* defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT) */
 
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
 /*