diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:14 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 12:42:25 -0800 |
| commit | f91a66c97b38a504827803bb93f83a7b85e50e5a (patch) | |
| tree | 277796611c5378ddb6e5dc48169c589ccb138df6 /drivers/w1/masters | |
| parent | 128485daadc53ff0570132c0c3ed70a6f0610bf6 (diff) | |
| download | talos-obmc-linux-f91a66c97b38a504827803bb93f83a7b85e50e5a.tar.gz talos-obmc-linux-f91a66c97b38a504827803bb93f83a7b85e50e5a.zip | |
w1: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/masters')
| -rw-r--r-- | drivers/w1/masters/matrox_w1.c | 2 | ||||
| -rw-r--r-- | drivers/w1/masters/omap_hdq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c index f667c26b2195..0a3c423a0c9d 100644 --- a/drivers/w1/masters/matrox_w1.c +++ b/drivers/w1/masters/matrox_w1.c @@ -55,7 +55,7 @@ static struct pci_driver matrox_w1_pci_driver = { .name = "matrox_w1", .id_table = matrox_w1_tbl, .probe = matrox_w1_probe, - .remove = __devexit_p(matrox_w1_remove), + .remove = matrox_w1_remove, }; /* diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index ca8e60bb2f9c..652ca7f207e3 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c @@ -74,7 +74,7 @@ static int __devexit omap_hdq_remove(struct platform_device *pdev); static struct platform_driver omap_hdq_driver = { .probe = omap_hdq_probe, - .remove = __devexit_p(omap_hdq_remove), + .remove = omap_hdq_remove, .driver = { .name = "omap_hdq", }, |
