diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/rtc/rtc-at91.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/rtc/rtc-at91.c')
| -rw-r--r-- | drivers/rtc/rtc-at91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-at91.c b/drivers/rtc/rtc-at91.c index b676f443c17e..dfd0ce86f6a0 100644 --- a/drivers/rtc/rtc-at91.c +++ b/drivers/rtc/rtc-at91.c | |||
| @@ -293,7 +293,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) | |||
| 293 | AT91_RTC_CALEV); | 293 | AT91_RTC_CALEV); |
| 294 | 294 | ||
| 295 | ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt, | 295 | ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt, |
| 296 | SA_SHIRQ, "at91_rtc", pdev); | 296 | IRQF_SHARED, "at91_rtc", pdev); |
| 297 | if (ret) { | 297 | if (ret) { |
| 298 | printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n", | 298 | printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n", |
| 299 | AT91_ID_SYS); | 299 | AT91_ID_SYS); |