diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 16:28:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 16:28:35 -0400 |
| commit | f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1 (patch) | |
| tree | 105b5bc4bb96b555dba90fa11dd5af66784c132f /drivers/tty | |
| parent | 98b98d316349e9a028e632629fe813d07fa5afdd (diff) | |
| parent | 4ef7e71444b48cc89152cbc499ed94dde50515ee (diff) | |
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/tty')
| -rw-r--r-- | drivers/tty/ipwireless/main.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_cs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/ipwireless/main.c b/drivers/tty/ipwireless/main.c index 444155a305ae..655c7948261c 100644 --- a/drivers/tty/ipwireless/main.c +++ b/drivers/tty/ipwireless/main.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <pcmcia/ss.h> | 33 | #include <pcmcia/ss.h> |
| 34 | #include <pcmcia/ds.h> | 34 | #include <pcmcia/ds.h> |
| 35 | 35 | ||
| 36 | static struct pcmcia_device_id ipw_ids[] = { | 36 | static const struct pcmcia_device_id ipw_ids[] = { |
| 37 | PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0100), | 37 | PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0100), |
| 38 | PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0200), | 38 | PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0200), |
| 39 | PCMCIA_DEVICE_NULL | 39 | PCMCIA_DEVICE_NULL |
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: | |||
| 670 | return -ENODEV; | 670 | return -ENODEV; |
| 671 | } | 671 | } |
| 672 | 672 | ||
| 673 | static struct pcmcia_device_id serial_ids[] = { | 673 | static const struct pcmcia_device_id serial_ids[] = { |
| 674 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021), | 674 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021), |
| 675 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a), | 675 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a), |
| 676 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a), | 676 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a), |