diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/rtc/interface.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/rtc/interface.c')
| -rw-r--r-- | drivers/rtc/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 8ec6b069a7f..23719f0acbf 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c | |||
| @@ -454,7 +454,7 @@ EXPORT_SYMBOL_GPL(rtc_update_irq_enable); | |||
| 454 | * @rtc: pointer to the rtc device | 454 | * @rtc: pointer to the rtc device |
| 455 | * | 455 | * |
| 456 | * This function is called when an AIE, UIE or PIE mode interrupt | 456 | * This function is called when an AIE, UIE or PIE mode interrupt |
| 457 | * has occured (or been emulated). | 457 | * has occurred (or been emulated). |
| 458 | * | 458 | * |
| 459 | * Triggers the registered irq_task function callback. | 459 | * Triggers the registered irq_task function callback. |
| 460 | */ | 460 | */ |