diff options
author | Lennert Buytenhek <buytenh@secretlab.ca> | 2010-12-14 16:55:57 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 05:20:06 -0500 |
commit | 04ea1cc8ab0f1e9db9aeaef79476e5c1a2027f6a (patch) | |
tree | 3abc5bc0794c569dcba95c0995a70b2aacb63f4e /arch/arm/plat-samsung/irq-vic-timer.c | |
parent | bb0b2374677b0678e671254112a326135522aba7 (diff) |
ARM: SAMSUNG: some GENERIC_HARDIRQS_NO_DEPRECATED build fixes
When GENERIC_HARDIRQS_NO_DEPRECATED is enabled, a number of struct
irq_desc members stop being directly accessible, and need to be
accessed via the irq_data struct instead -- this patch fixes up the
plat-samsung sites that still access those members directly.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung/irq-vic-timer.c')
-rw-r--r-- | arch/arm/plat-samsung/irq-vic-timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/irq-vic-timer.c b/arch/arm/plat-samsung/irq-vic-timer.c index 7ce77ddb729d..dd8692ae5c4c 100644 --- a/arch/arm/plat-samsung/irq-vic-timer.c +++ b/arch/arm/plat-samsung/irq-vic-timer.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc) | 25 | static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc) |
26 | { | 26 | { |
27 | generic_handle_irq((int)desc->handler_data); | 27 | generic_handle_irq((int)desc->irq_data.handler_data); |
28 | } | 28 | } |
29 | 29 | ||
30 | /* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */ | 30 | /* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */ |
@@ -86,5 +86,5 @@ void __init s3c_init_vic_timer_irq(unsigned int parent_irq, | |||
86 | set_irq_handler(timer_irq, handle_level_irq); | 86 | set_irq_handler(timer_irq, handle_level_irq); |
87 | set_irq_flags(timer_irq, IRQF_VALID); | 87 | set_irq_flags(timer_irq, IRQF_VALID); |
88 | 88 | ||
89 | desc->handler_data = (void *)timer_irq; | 89 | desc->irq_data.handler_data = (void *)timer_irq; |
90 | } | 90 | } |