aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:22:17 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 15:09:58 -0800
commit2a91a6d1422f6dc3cb27689e18e16b8c98ec1c73 (patch)
tree49e31e9e12ed53a49e759a2e507a19ee4313e196 /drivers/staging/media
parentstaging: solo6x10: remove use of __devinit (diff)
downloadlinux-dev-2a91a6d1422f6dc3cb27689e18e16b8c98ec1c73.tar.xz
linux-dev-2a91a6d1422f6dc3cb27689e18e16b8c98ec1c73.zip
staging: dt3155v4l: 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/dt3155v4l/dt3155v4l.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 15f7468a2475..c8af551626fb 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -718,7 +718,7 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = {
*/
};
-static int __devinit
+static int
dt3155_init_board(struct pci_dev *pdev)
{
struct dt3155_priv *pd = pci_get_drvdata(pdev);
@@ -836,7 +836,7 @@ struct dma_coherent_mem {
unsigned long *bitmap;
};
-static int __devinit
+static int
dt3155_alloc_coherent(struct device *dev, size_t size, int flags)
{
struct dma_coherent_mem *mem;
@@ -891,7 +891,7 @@ dt3155_free_coherent(struct device *dev)
kfree(mem);
}
-static int __devinit
+static int
dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
int err;