Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed1705af authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m68k: fix macfb init 



To be used by module_init() function should return int; same for functions
that have "return -ENODEV;" in them, actually ;-)

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 54a5a6eb

drivers/video/macfb.c

+8 −7
Original line number Diff line number Diff line
@@ -609,18 +609,19 @@ void __init macfb_setup(char *options) 
	}

}



void __init macfb_init(void)

static int __init macfb_init(void)

{

	int video_cmap_len, video_is_nubus = 0;

	struct nubus_dev* ndev = NULL;

	char *option = NULL;

	int err;



	if (fb_get_options("macfb", &option))

		return -ENODEV;

	macfb_setup(option);



	if (!MACH_IS_MAC) 

		return;

		return -ENODEV;



	/* There can only be one internal video controller anyway so

	   we're not too worried about this */
@@ -958,11 +959,11 @@ void __init macfb_init(void) 


	fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);

	

	if (register_framebuffer(&fb_info) < 0)

		return;



	err = register_framebuffer(&fb_info);

	if (!err)

		printk("fb%d: %s frame buffer device\n",

		       fb_info.node, fb_info.fix.id);

	return err;

}



module_init(macfb_init);