git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git]
/
drivers
/
net
/
pcmcia
/
3c574_cs.c
diff --git
a/drivers/net/pcmcia/3c574_cs.c
b/drivers/net/pcmcia/3c574_cs.c
index
81ac330
..
34c5e1c
100644
(file)
--- a/
drivers/net/pcmcia/3c574_cs.c
+++ b/
drivers/net/pcmcia/3c574_cs.c
@@
-1150,7
+1150,7
@@
static int el3_close(struct net_device *dev)
return 0;
}
-static struct pcmcia_device_id tc574_ids[] = {
+static
const
struct pcmcia_device_id tc574_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0574),
PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0101, 0x0556, "cis/3CCFEM556.cis"),
PCMCIA_DEVICE_NULL,