VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2011-05-24 13:28:35 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2011-05-24 13:28:35 -0700 commit: f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1 parent: 98b98d316349e9a028e632629fe813d07fa5afdd

Commit Summary:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

Diffstat:

1 file changed, 1 insertion, 1 deletion

diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 787ebdeae310..067ad517c1f5 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -178,7 +178,7 @@ static void parport_cs_release(struct pcmcia_device *link)
 } /* parport_cs_release */
 
 
-static struct pcmcia_device_id parport_ids[] = {
+static const struct pcmcia_device_id parport_ids[] = {
 	PCMCIA_DEVICE_FUNC_ID(3),
 	PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc),
 	PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0003),