summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/pac7311.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2011-01-13 09:20:29 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 14:45:35 +0100
commit95c967c167785eb991cf6b22fb854dd8d61d0ff8 (patch)
treea182e8117e53ad46d28c9201bcf967433387d680 /drivers/media/video/gspca/pac7311.c
parent[media] gspca: Version change (diff)
downloadlinux-95c967c167785eb991cf6b22fb854dd8d61d0ff8.tar.xz
linux-95c967c167785eb991cf6b22fb854dd8d61d0ff8.zip
[media] gspca: Remove __devinit, __devinitconst and __devinitdata
__devinit* must not be used in USB drivers. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/pac7311.c')
-rw-r--r--drivers/media/video/gspca/pac7311.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 6820f5d58b19..f8801b50e64f 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -837,7 +837,7 @@ static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x093a, 0x2600)},
{USB_DEVICE(0x093a, 0x2601)},
{USB_DEVICE(0x093a, 0x2603)},
@@ -849,7 +849,7 @@ static const struct usb_device_id device_table[] __devinitconst = {
MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */
-static int __devinit sd_probe(struct usb_interface *intf,
+static int sd_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),