diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/char/genrtc.c | |
parent | [WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff) | |
download | linux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/genrtc.c')
-rw-r--r-- | drivers/char/genrtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c index 23b25ada65ea..9e1fc02967ff 100644 --- a/drivers/char/genrtc.c +++ b/drivers/char/genrtc.c @@ -12,7 +12,7 @@ * * This driver allows use of the real time clock (built into * nearly all computers) from user space. It exports the /dev/rtc - * interface supporting various ioctl() and also the /proc/dev/rtc + * interface supporting various ioctl() and also the /proc/driver/rtc * pseudo-file for status information. * * The ioctls can be used to set the interrupt behaviour where @@ -207,7 +207,7 @@ static ssize_t gen_rtc_read(struct file *file, char __user *buf, sizeof(unsigned long); } out: - current->state = TASK_RUNNING; + __set_current_state(TASK_RUNNING); remove_wait_queue(&gen_rtc_wait, &wait); return retval; @@ -377,7 +377,7 @@ static int gen_rtc_release(struct inode *inode, struct file *file) #ifdef CONFIG_PROC_FS /* - * Info exported via "/proc/rtc". + * Info exported via "/proc/driver/rtc". */ static int gen_rtc_proc_output(char *buf) |