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-ds1553.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/rtc/rtc-ds1553.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1553.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index 762521a1419c..209001495474 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
| @@ -341,7 +341,7 @@ static int __init ds1553_rtc_probe(struct platform_device *pdev) | |||
| 341 | 341 | ||
| 342 | if (pdata->irq >= 0) { | 342 | if (pdata->irq >= 0) { |
| 343 | writeb(0, ioaddr + RTC_INTERRUPTS); | 343 | writeb(0, ioaddr + RTC_INTERRUPTS); |
| 344 | if (request_irq(pdata->irq, ds1553_rtc_interrupt, SA_SHIRQ, | 344 | if (request_irq(pdata->irq, ds1553_rtc_interrupt, IRQF_SHARED, |
| 345 | pdev->name, pdev) < 0) { | 345 | pdev->name, pdev) < 0) { |
| 346 | dev_warn(&pdev->dev, "interrupt not available.\n"); | 346 | dev_warn(&pdev->dev, "interrupt not available.\n"); |
| 347 | pdata->irq = -1; | 347 | pdata->irq = -1; |