diff --git a/[refs] b/[refs] index e2a11ca9d3d8..781871d06524 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe5c49b3325e38dd350fc3ceaf30b8f8a3f136b8 +refs/heads/master: 0b5e4092241eb4015a91e01d9aca32c214ea8b50 diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c index d017e67d2ffa..525a7cbec1c9 100644 --- a/trunk/drivers/staging/et131x/et131x.c +++ b/trunk/drivers/staging/et131x/et131x.c @@ -5099,7 +5099,7 @@ static struct pci_driver et131x_driver = { .name = DRIVER_NAME, .id_table = et131x_pci_table, .probe = et131x_pci_setup, - .remove = __devexit_p(et131x_pci_remove), + .remove = et131x_pci_remove, .driver.pm = ET131X_PM_OPS, };