diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /drivers/usb/image | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/usb/image')
| -rw-r--r-- | drivers/usb/image/mdc800.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c index 08daf400f985..ca6305c1d64c 100644 --- a/drivers/usb/image/mdc800.c +++ b/drivers/usb/image/mdc800.c | |||
| @@ -424,7 +424,7 @@ static void mdc800_usb_download_notify (struct urb *urb, struct pt_regs *res) | |||
| 424 | ***************************************************************************/ | 424 | ***************************************************************************/ |
| 425 | 425 | ||
| 426 | static struct usb_driver mdc800_usb_driver; | 426 | static struct usb_driver mdc800_usb_driver; |
| 427 | static struct file_operations mdc800_device_ops; | 427 | static const struct file_operations mdc800_device_ops; |
| 428 | static struct usb_class_driver mdc800_class = { | 428 | static struct usb_class_driver mdc800_class = { |
| 429 | .name = "mdc800%d", | 429 | .name = "mdc800%d", |
| 430 | .fops = &mdc800_device_ops, | 430 | .fops = &mdc800_device_ops, |
| @@ -941,7 +941,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s | |||
| 941 | ****************************************************************************/ | 941 | ****************************************************************************/ |
| 942 | 942 | ||
| 943 | /* File Operations of this drivers */ | 943 | /* File Operations of this drivers */ |
| 944 | static struct file_operations mdc800_device_ops = | 944 | static const struct file_operations mdc800_device_ops = |
| 945 | { | 945 | { |
| 946 | .owner = THIS_MODULE, | 946 | .owner = THIS_MODULE, |
| 947 | .read = mdc800_device_read, | 947 | .read = mdc800_device_read, |