summaryrefslogtreecommitdiffstats
path: root/drivers/misc/phantom.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 19:23:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 21:51:53 +0100
commit80c8ae289266529445fad030fabf5fcf01ccda0d (patch)
treeeba9aed6018d314a492eea1e00f03e5de83a2665 /drivers/misc/phantom.c
parentdrivers/misc: remove use of __devexit_p (diff)
downloadlinux-80c8ae289266529445fad030fabf5fcf01ccda0d.tar.xz
linux-80c8ae289266529445fad030fabf5fcf01ccda0d.zip
misc: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl> Cc: Eric Piel <eric.piel@tremplin-utc.net> Cc: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/phantom.c')
-rw-r--r--drivers/misc/phantom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 79038e9ced0f..394150df2afe 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -324,7 +324,7 @@ static irqreturn_t phantom_isr(int irq, void *data)
* Init and deinit driver
*/
-static unsigned int __devinit phantom_get_free(void)
+static unsigned int phantom_get_free(void)
{
unsigned int i;
@@ -335,7 +335,7 @@ static unsigned int __devinit phantom_get_free(void)
return i;
}
-static int __devinit phantom_probe(struct pci_dev *pdev,
+static int phantom_probe(struct pci_dev *pdev,
const struct pci_device_id *pci_id)
{
struct phantom_device *pht;