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/char/pcmcia/cm4000_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/char/pcmcia/cm4000_cs.c')
| -rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 90bd01671c70..a7584860e9a7 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
| @@ -1869,7 +1869,7 @@ static const struct file_operations cm4000_fops = { | |||
| 1869 | .llseek = no_llseek, | 1869 | .llseek = no_llseek, |
| 1870 | }; | 1870 | }; |
| 1871 | 1871 | ||
| 1872 | static struct pcmcia_device_id cm4000_ids[] = { | 1872 | static const struct pcmcia_device_id cm4000_ids[] = { |
| 1873 | PCMCIA_DEVICE_MANF_CARD(0x0223, 0x0002), | 1873 | PCMCIA_DEVICE_MANF_CARD(0x0223, 0x0002), |
| 1874 | PCMCIA_DEVICE_PROD_ID12("CardMan", "4000", 0x2FB368CA, 0xA2BD8C39), | 1874 | PCMCIA_DEVICE_PROD_ID12("CardMan", "4000", 0x2FB368CA, 0xA2BD8C39), |
| 1875 | PCMCIA_DEVICE_NULL, | 1875 | PCMCIA_DEVICE_NULL, |