Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105485
b: refs/heads/master
c: c68d07b
h: refs/heads/master
i:
  105483: 7fb5e89
v: v3
  • Loading branch information
Carlos R. Mafra authored and Linus Torvalds committed Jul 24, 2008
1 parent f23d9a5 commit ebd4f07
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 02bb584f3b1cfc8188522a4d2c8881b65073a4f1
refs/heads/master: c68d07b2da54c941bb36c9d6d35fe8f263ee10ef
2 changes: 0 additions & 2 deletions trunk/drivers/char/rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
return 0;
}
#endif
#else
extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
#endif

/*
Expand Down
5 changes: 4 additions & 1 deletion trunk/drivers/rtc/rtc-cmos.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@
#define hpet_rtc_timer_init() do { } while (0)
#define hpet_register_irq_handler(h) 0
#define hpet_unregister_irq_handler(h) do { } while (0)
extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
{
return 0;
}
#endif

struct cmos_rtc {
Expand Down

0 comments on commit ebd4f07

Please sign in to comment.