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 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
drivers
/
telephony
/
ixj_pcmcia.c
diff --git
a/drivers/telephony/ixj_pcmcia.c
b/drivers/telephony/ixj_pcmcia.c
index
d005b9e
..
05032e2
100644
(file)
--- a/
drivers/telephony/ixj_pcmcia.c
+++ b/
drivers/telephony/ixj_pcmcia.c
@@
-157,7
+157,7
@@
static void ixj_cs_release(struct pcmcia_device *link)
pcmcia_disable_device(link);
}
-static struct pcmcia_device_id ixj_ids[] = {
+static
const
struct pcmcia_device_id ixj_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0x0257, 0x0600),
PCMCIA_DEVICE_NULL
};