diff --git a/[refs] b/[refs] index bb0a330bd625..2b6599a9cb4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4ec0f23c878f761cf33f3cbb66c66d6c05931ba +refs/heads/master: 62b56faa43a7e672e659d14f38f553ed8b40ea70 diff --git a/trunk/drivers/video/tgafb.c b/trunk/drivers/video/tgafb.c index 3099630d0c3d..9d9d2009ad8c 100644 --- a/trunk/drivers/video/tgafb.c +++ b/trunk/drivers/video/tgafb.c @@ -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 int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *); -#ifdef MODULE static void tgafb_pci_unregister(struct pci_dev *); -#endif 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; } -#ifdef MODULE static void __exit tgafb_pci_unregister(struct pci_dev *pdev) { @@ -1500,6 +1497,7 @@ tgafb_pci_unregister(struct pci_dev *pdev) kfree(info); } +#ifdef MODULE static void __exit tgafb_exit(void) {