summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 13:28:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 13:28:35 -0700
commitf50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1 (patch)
tree105b5bc4bb96b555dba90fa11dd5af66784c132f /drivers/usb
parent98b98d316349e9a028e632629fe813d07fa5afdd (diff)
parent4ef7e71444b48cc89152cbc499ed94dde50515ee (diff)
downloadop-kernel-dev-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.zip
op-kernel-dev-f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: Make struct pcmcia_device_id const, sound drivers edition staging: pcmcia: Convert pcmcia_device_id declarations to const pcmcia: Convert pcmcia_device_id declarations to const pcmcia: Make declaration and uses of struct pcmcia_device_id const pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/sl811_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 3775c03..3b6f50e 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -187,7 +187,7 @@ static int sl811_cs_probe(struct pcmcia_device *link)
return sl811_cs_config(link);
}
-static struct pcmcia_device_id sl811_ids[] = {
+static const struct pcmcia_device_id sl811_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0xc015, 0x0001), /* RATOC USB HOST CF+ Card */
PCMCIA_DEVICE_NULL,
};
OpenPOWER on IntegriCloud