diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /drivers/pcmcia | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 88494149e91..27523c5f4da 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c | |||
| @@ -765,7 +765,7 @@ free_out: | |||
| 765 | 765 | ||
| 766 | /*====================================================================*/ | 766 | /*====================================================================*/ |
| 767 | 767 | ||
| 768 | static struct file_operations ds_fops = { | 768 | static const struct file_operations ds_fops = { |
| 769 | .owner = THIS_MODULE, | 769 | .owner = THIS_MODULE, |
| 770 | .open = ds_open, | 770 | .open = ds_open, |
| 771 | .release = ds_release, | 771 | .release = ds_release, |