video: use __weak

[karo-tx-uboot.git] / drivers / video / cfb_console.c

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 923192787996f70942b766c1c9086f787ee04e3a..8567231bdcdedf4e43d6e835e49296cefe0b500e 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -1171,14 +1171,11 @@ void video_puts(struct stdio_dev *dev, const char *s)
  * video_set_lut() if they do not support 8 bpp format.
  * Implement weak default function instead.
  */
  * video_set_lut() if they do not support 8 bpp format.
  * Implement weak default function instead.
  */

-void __video_set_lut(unsigned int index, unsigned char r,
+__weak void video_set_lut(unsigned int index, unsigned char r,

                     unsigned char g, unsigned char b)
 {
 }
 
                     unsigned char g, unsigned char b)
 {
 }
 

-void video_set_lut(unsigned int, unsigned char, unsigned char, unsigned char)
-       __attribute__ ((weak, alias("__video_set_lut")));
-

 #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 
 #define FILL_8BIT_332RGB(r,g,b)        {                       \
 #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 
 #define FILL_8BIT_332RGB(r,g,b)        {                       \


@@ -2240,15 +2237,12 @@ static int video_init(void)
  * Implement a weak default function for boards that optionally
  * need to skip the video initialization.
  */
  * Implement a weak default function for boards that optionally
  * need to skip the video initialization.
  */

-int __board_video_skip(void)
+__weak int board_video_skip(void)

 {
        /* As default, don't skip test */
        return 0;
 }
 
 {
        /* As default, don't skip test */
        return 0;
 }
 

-int board_video_skip(void)
-       __attribute__ ((weak, alias("__board_video_skip")));
-

 int drv_video_init(void)
 {
        int skip_dev_init;
 int drv_video_init(void)
 {
        int skip_dev_init;