diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
| commit | ece928df16494becd43f999aff9bd530182e7e81 (patch) | |
| tree | 905042764ea5d8ab6eda63666406e19f607bcf4c /drivers/net/wireless/hostap/hostap_cs.c | |
| parent | 3d1c1829ebe7e8bb48a997b39b4865abc9197e5e (diff) | |
| parent | dda54e76d7dba0532ebdd72e0b4f492a03f83225 (diff) | |
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ioctl.c
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_cs.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 2176edede39b..c052a0d5cbdd 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
| @@ -620,7 +620,7 @@ static int hostap_cs_resume(struct pcmcia_device *link) | |||
| 620 | return 0; | 620 | return 0; |
| 621 | } | 621 | } |
| 622 | 622 | ||
| 623 | static struct pcmcia_device_id hostap_cs_ids[] = { | 623 | static const struct pcmcia_device_id hostap_cs_ids[] = { |
| 624 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), | 624 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), |
| 625 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), | 625 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), |
| 626 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), | 626 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), |