diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-08 21:05:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-08 21:05:09 -0400 |
| commit | 8d7458daea2a6809d32418bf489b949d23de99ea (patch) | |
| tree | 8c4356632108c4849328cb1464621210dad2d572 | |
| parent | 3975d16760d4be7402d1067c548c30c427971331 (diff) | |
| parent | af0d5cb908f7f9adeb5d3d3dbef64c644bb6809c (diff) | |
Merge branch 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
hp_sdc_rtc: fix broken ioctl conversion
| -rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index e00a1cc79c0..c1906647905 100644 --- a/drivers/input/misc/hp_sdc_rtc.c +++ b/drivers/input/misc/hp_sdc_rtc.c | |||
| @@ -678,7 +678,7 @@ static const struct file_operations hp_sdc_rtc_fops = { | |||
| 678 | .llseek = no_llseek, | 678 | .llseek = no_llseek, |
| 679 | .read = hp_sdc_rtc_read, | 679 | .read = hp_sdc_rtc_read, |
| 680 | .poll = hp_sdc_rtc_poll, | 680 | .poll = hp_sdc_rtc_poll, |
| 681 | .unlocked_ioctl = hp_sdc_rtc_ioctl, | 681 | .unlocked_ioctl = hp_sdc_rtc_unlocked_ioctl, |
| 682 | .open = hp_sdc_rtc_open, | 682 | .open = hp_sdc_rtc_open, |
| 683 | .fasync = hp_sdc_rtc_fasync, | 683 | .fasync = hp_sdc_rtc_fasync, |
| 684 | }; | 684 | }; |