diff --git a/[refs] b/[refs] index 6546d4cac70b..be698c09a72d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29c354420e7af210115bee8e5e5d60ba0f3442a6 +refs/heads/master: 79fc8d891bf746c0f4da88f6fcca0f2cbcf21094 diff --git a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c index 2e7b711c8501..15f7468a2475 100644 --- a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c @@ -983,7 +983,7 @@ static struct pci_driver pci_driver = { .name = DT3155_NAME, .id_table = pci_ids, .probe = dt3155_probe, - .remove = __devexit_p(dt3155_remove), + .remove = dt3155_remove, }; module_pci_driver(pci_driver);