diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 12:01:51 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-10 12:01:51 +1000 |
commit | 37cd7501581379b1ed5b626e47c6e727cc3e4892 (patch) | |
tree | cd9eb32607ae6eefc6dfb4471106586c80dbd17b /drivers/tty/serial | |
parent | d9486caec35fceb82f1216b05516f4d8d2a266d9 (diff) | |
parent | 2202a5a7490a9de282846ea8d4a56d0249e09033 (diff) |
Merge remote-tracking branch 'pcmcia/master'
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r-- | drivers/tty/serial/serial_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/serial_cs.c b/drivers/tty/serial/serial_cs.c index 1ef4df9bf7e4..eef736ff810a 100644 --- a/drivers/tty/serial/serial_cs.c +++ b/drivers/tty/serial/serial_cs.c @@ -670,7 +670,7 @@ failed: return -ENODEV; } -static struct pcmcia_device_id serial_ids[] = { +static const struct pcmcia_device_id serial_ids[] = { PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021), PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a), PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a), |