diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/rtc/rtc-s3c.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/rtc/rtc-s3c.c')
| -rw-r--r-- | drivers/rtc/rtc-s3c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 625dad2eeb4f..e301dea57bb3 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
| @@ -46,7 +46,7 @@ static unsigned int tick_count; | |||
| 46 | 46 | ||
| 47 | /* IRQ Handlers */ | 47 | /* IRQ Handlers */ |
| 48 | 48 | ||
| 49 | static irqreturn_t s3c_rtc_alarmirq(int irq, void *id, struct pt_regs *r) | 49 | static irqreturn_t s3c_rtc_alarmirq(int irq, void *id) |
| 50 | { | 50 | { |
| 51 | struct rtc_device *rdev = id; | 51 | struct rtc_device *rdev = id; |
| 52 | 52 | ||
| @@ -54,7 +54,7 @@ static irqreturn_t s3c_rtc_alarmirq(int irq, void *id, struct pt_regs *r) | |||
| 54 | return IRQ_HANDLED; | 54 | return IRQ_HANDLED; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | static irqreturn_t s3c_rtc_tickirq(int irq, void *id, struct pt_regs *r) | 57 | static irqreturn_t s3c_rtc_tickirq(int irq, void *id) |
| 58 | { | 58 | { |
| 59 | struct rtc_device *rdev = id; | 59 | struct rtc_device *rdev = id; |
| 60 | 60 | ||