diff --git a/[refs] b/[refs] index 7bfaf1ce3d16..95876ae81189 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c45c685c1a582e27787b5aa85844f2ee6986018c +refs/heads/master: 3ec33012dc07ab7e12fdd3f7f927c09264dcb5ec diff --git a/trunk/drivers/mfd/vx855.c b/trunk/drivers/mfd/vx855.c index ebb059765edd..348052aa5dbf 100644 --- a/trunk/drivers/mfd/vx855.c +++ b/trunk/drivers/mfd/vx855.c @@ -112,7 +112,7 @@ static __devinit int vx855_probe(struct pci_dev *pdev, return ret; } -static void vx855_remove(struct pci_dev *pdev) +static void __devexit vx855_remove(struct pci_dev *pdev) { mfd_remove_devices(&pdev->dev); pci_disable_device(pdev);