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

Commit 62b56faa authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] Fix tgafb.c compile failure 



The untested patch below should fix this compile error.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e4ec0f23

drivers/video/tgafb.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -45,9 +45,7 @@ static void tgafb_fillrect(struct fb_info *, const struct fb_fillrect *); 
static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);

static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);





static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);

static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);

#ifdef MODULE

static void tgafb_pci_unregister(struct pci_dev *);

static void tgafb_pci_unregister(struct pci_dev *);

#endif





static const char *mode_option = "640x480@60";

static const char *mode_option = "640x480@60";
@@ -1484,7 +1482,6 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return ret;

	return ret;

}

}





#ifdef MODULE

static void __exit

static void __exit

tgafb_pci_unregister(struct pci_dev *pdev)

tgafb_pci_unregister(struct pci_dev *pdev)

{

{
@@ -1500,6 +1497,7 @@ tgafb_pci_unregister(struct pci_dev *pdev) 
	kfree(info);

	kfree(info);

}

}





#ifdef MODULE

static void __exit

static void __exit

tgafb_exit(void)

tgafb_exit(void)

{

{