summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorBill Pemberton2012-11-19 19:22:16 +0100
committerGreg Kroah-Hartman2012-11-22 00:09:57 +0100
commitffba1bc963ca5efe05836232bcf2d44916f0e3e9 (patch)
tree123246276e6612d00722df6a26f110d6534ec8d3 /drivers/staging/media
parentstaging: lirc: remove use of __devinit (diff)
downloadkernel-qcow2-linux-ffba1bc963ca5efe05836232bcf2d44916f0e3e9.tar.gz
kernel-qcow2-linux-ffba1bc963ca5efe05836232bcf2d44916f0e3e9.tar.xz
kernel-qcow2-linux-ffba1bc963ca5efe05836232bcf2d44916f0e3e9.zip
staging: solo6x10: 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: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media')
-rw-r--r--drivers/staging/media/solo6x10/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c
index 3ee9b125797f..c0319e6a3806 100644
--- a/drivers/staging/media/solo6x10/core.c
+++ b/drivers/staging/media/solo6x10/core.c
@@ -129,7 +129,7 @@ static void free_solo_dev(struct solo_dev *solo_dev)
kfree(solo_dev);
}
-static int __devinit solo_pci_probe(struct pci_dev *pdev,
+static int solo_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
struct solo_dev *solo_dev;