[PATCH] fbdev: fix module dependency loop

Exporting struct fb_display produces this warning error on depmod:

WARNING: Module
/lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_ud.ko
ignored, due to loop
WARNING: Module
/lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_rotate.ko
ignored, due to loop
WARNING: Module
/lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_cw.ko
ignored, due to loop
WARNING: Module
/lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_ccw.ko
ignored, due to loop
WARNING: Module
/lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon.ko ignored,
due to loop
WARNING: Loop detected:
/lib/modules/2.6.14-mm2/kernel/drivers/video/console/bitblit.ko needs

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c
index 6c6f3b6dd175..6d92b8456206 100644
--- a/drivers/video/console/fbcon_cw.c
+++ b/drivers/video/console/fbcon_cw.c
@@ -49,9 +49,9 @@ static inline void cw_update_attr(u8 *dst, u8 *src, int attribute,
 static void cw_bmove(struct vc_data *vc, struct fb_info *info, int sy,
                      int sx, int dy, int dx, int height, int width)
 {
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_ops *ops = info->fbcon_par;
         struct fb_copyarea area;
-        u32 vxres = GETVXRES(p->scrollmode, info);
+        u32 vxres = GETVXRES(ops->p->scrollmode, info);
 
         area.sx = vxres - ((sy + height) * vc->vc_font.height);
         area.sy = sx * vc->vc_font.width;
@@ -66,10 +66,10 @@ static void cw_bmove(struct vc_data *vc, struct fb_info *info, int sy,
 static void cw_clear(struct vc_data *vc, struct fb_info *info, int sy,
                      int sx, int height, int width)
 {
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_ops *ops = info->fbcon_par;
         struct fb_fillrect region;
         int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
-        u32 vxres = GETVXRES(p->scrollmode, info);
+        u32 vxres = GETVXRES(ops->p->scrollmode, info);
 
         region.color = attr_bgcol_ec(bgshift,vc);
         region.dx = vxres - ((sy + height) * vc->vc_font.height);
@@ -117,7 +117,6 @@ static void cw_putcs(struct vc_data *vc, struct fb_info *info,
                       int fg, int bg)
 {
         struct fb_image image;
-        struct display *p = &fb_display[vc->vc_num];
         struct fbcon_ops *ops = info->fbcon_par;
         u32 width = (vc->vc_font.height + 7)/8;
         u32 cellsize = width * vc->vc_font.width;
@@ -127,7 +126,7 @@ static void cw_putcs(struct vc_data *vc, struct fb_info *info,
         u32 cnt, pitch, size;
         u32 attribute = get_attribute(info, scr_readw(s));
         u8 *dst, *buf = NULL;
-        u32 vxres = GETVXRES(p->scrollmode, info);
+        u32 vxres = GETVXRES(ops->p->scrollmode, info);
 
         if (!ops->fontbuffer)
                 return;
@@ -381,8 +380,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info,
 int cw_update_start(struct fb_info *info)
 {
         struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[ops->currcon];
-        u32 vxres = GETVXRES(p->scrollmode, info);
+        u32 vxres = GETVXRES(ops->p->scrollmode, info);
         u32 xoffset;
         int err;