aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/masters/matrox_w1.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/w1/masters/matrox_w1.c')
-rw-r--r--drivers/w1/masters/matrox_w1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 0a3c423a0c9d..1197f7ec54f2 100644
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -48,7 +48,7 @@ static struct pci_device_id matrox_w1_tbl[] = {
48}; 48};
49MODULE_DEVICE_TABLE(pci, matrox_w1_tbl); 49MODULE_DEVICE_TABLE(pci, matrox_w1_tbl);
50 50
51static int __devinit matrox_w1_probe(struct pci_dev *, const struct pci_device_id *); 51static int matrox_w1_probe(struct pci_dev *, const struct pci_device_id *);
52static void __devexit matrox_w1_remove(struct pci_dev *); 52static void __devexit matrox_w1_remove(struct pci_dev *);
53 53
54static struct pci_driver matrox_w1_pci_driver = { 54static struct pci_driver matrox_w1_pci_driver = {
@@ -152,7 +152,7 @@ static void matrox_w1_hw_init(struct matrox_device *dev)
152 matrox_w1_write_reg(dev, MATROX_GET_CONTROL, 0x00); 152 matrox_w1_write_reg(dev, MATROX_GET_CONTROL, 0x00);
153} 153}
154 154
155static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 155static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
156{ 156{
157 struct matrox_device *dev; 157 struct matrox_device *dev;
158 int err; 158 int err;