diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
| commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
| tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /drivers/char | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spu... (diff) | |
| parent | [POWERPC] Convert the cell IOMMU fixed mapping to 16M IOMMU pages (diff) | |
| download | linux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.tar.xz linux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.zip | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/rtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 78b151c4d20f..5c3142b6f1fc 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -110,8 +110,8 @@ static int rtc_has_irq = 1; #define hpet_set_rtc_irq_bit(arg) 0 #define hpet_rtc_timer_init() do { } while (0) #define hpet_rtc_dropped_irq() 0 -#define hpet_register_irq_handler(h) 0 -#define hpet_unregister_irq_handler(h) 0 +#define hpet_register_irq_handler(h) ({ 0; }) +#define hpet_unregister_irq_handler(h) ({ 0; }) #ifdef RTC_IRQ static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) { |