aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/carminefb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/carminefb.c')
-rw-r--r--drivers/video/carminefb.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index 2c76fdf23f2a..153dd65b0ae8 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -78,7 +78,7 @@ struct carmine_fb {
78 u32 pseudo_palette[16]; 78 u32 pseudo_palette[16];
79}; 79};
80 80
81static struct fb_fix_screeninfo carminefb_fix __devinitdata = { 81static struct fb_fix_screeninfo carminefb_fix = {
82 .id = "Carmine", 82 .id = "Carmine",
83 .type = FB_TYPE_PACKED_PIXELS, 83 .type = FB_TYPE_PACKED_PIXELS,
84 .visual = FB_VISUAL_TRUECOLOR, 84 .visual = FB_VISUAL_TRUECOLOR,
@@ -537,8 +537,9 @@ static struct fb_ops carminefb_ops = {
537 .fb_setcolreg = carmine_setcolreg, 537 .fb_setcolreg = carmine_setcolreg,
538}; 538};
539 539
540static int __devinit alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base, 540static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
541 int smem_offset, struct device *device, struct fb_info **rinfo) 541 int smem_offset, struct device *device,
542 struct fb_info **rinfo)
542{ 543{
543 int ret; 544 int ret;
544 struct fb_info *info; 545 struct fb_info *info;
@@ -606,8 +607,7 @@ static void cleanup_fb_device(struct fb_info *info)
606 } 607 }
607} 608}
608 609
609static int __devinit carminefb_probe(struct pci_dev *dev, 610static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
610 const struct pci_device_id *ent)
611{ 611{
612 struct carmine_hw *hw; 612 struct carmine_hw *hw;
613 struct device *device = &dev->dev; 613 struct device *device = &dev->dev;
@@ -721,7 +721,7 @@ err_enable_pci:
721 return ret; 721 return ret;
722} 722}
723 723
724static void __devexit carminefb_remove(struct pci_dev *dev) 724static void carminefb_remove(struct pci_dev *dev)
725{ 725{
726 struct carmine_hw *hw = pci_get_drvdata(dev); 726 struct carmine_hw *hw = pci_get_drvdata(dev);
727 struct fb_fix_screeninfo fix; 727 struct fb_fix_screeninfo fix;
@@ -752,7 +752,7 @@ static void __devexit carminefb_remove(struct pci_dev *dev)
752} 752}
753 753
754#define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf 754#define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf
755static struct pci_device_id carmine_devices[] __devinitdata = { 755static struct pci_device_id carmine_devices[] = {
756{ 756{
757 PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)}, 757 PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)},
758 {0, 0, 0, 0, 0, 0, 0} 758 {0, 0, 0, 0, 0, 0, 0}
@@ -764,7 +764,7 @@ static struct pci_driver carmine_pci_driver = {
764 .name = "carminefb", 764 .name = "carminefb",
765 .id_table = carmine_devices, 765 .id_table = carmine_devices,
766 .probe = carminefb_probe, 766 .probe = carminefb_probe,
767 .remove = __devexit_p(carminefb_remove), 767 .remove = carminefb_remove,
768}; 768};
769 769
770static int __init carminefb_init(void) 770static int __init carminefb_init(void)