diff --git a/[refs] b/[refs] index c55c13b5ffb9..f7bdde08480b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89f6883c70245323215b9e5786964621e4484382 +refs/heads/master: a1179b20ed939792635aacefcbc676d089a9ae2d diff --git a/trunk/drivers/staging/vt6655/device_main.c b/trunk/drivers/staging/vt6655/device_main.c index 9e3b3f2bbe53..4e40bc9348d4 100644 --- a/trunk/drivers/staging/vt6655/device_main.c +++ b/trunk/drivers/staging/vt6655/device_main.c @@ -902,7 +902,7 @@ static const struct net_device_ops device_netdev_ops = { .ndo_set_rx_mode = device_set_multi, }; -static int __devinit +static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) { static bool bFirst = true; @@ -1099,7 +1099,7 @@ static void device_print_info(PSDevice pDevice) } -static void __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, +static void vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO pChip_info) { PSDevice p;