diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:59 -0400 |
| commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
| tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /drivers/usb/misc/rio500.c | |
| parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/misc/rio500.c')
| -rw-r--r-- | drivers/usb/misc/rio500.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c index d645f3899fe1..32d0199d0c32 100644 --- a/drivers/usb/misc/rio500.c +++ b/drivers/usb/misc/rio500.c | |||
| @@ -429,8 +429,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos) | |||
| 429 | return read_count; | 429 | return read_count; |
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | static struct | 432 | static const struct file_operations usb_rio_fops = { |
| 433 | file_operations usb_rio_fops = { | ||
| 434 | .owner = THIS_MODULE, | 433 | .owner = THIS_MODULE, |
| 435 | .read = read_rio, | 434 | .read = read_rio, |
| 436 | .write = write_rio, | 435 | .write = write_rio, |