diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 19:08:19 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 19:08:19 +0400 |
| commit | 4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8 (patch) | |
| tree | 354ba30d39673f25345f3fb5de64ec7c244fa6d1 /arch/arm/plat-samsung | |
| parent | fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff) | |
| parent | 5d747c6f2c9e1615685866251416268a0f648ffc (diff) | |
| download | linux-4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8.tar.xz | |
Merge branch 'samsung/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/backlight.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/irq-vic-timer.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/backlight.h b/arch/arm/plat-samsung/include/plat/backlight.h index 51d8da846a62..ad530c78fe8c 100644 --- a/arch/arm/plat-samsung/include/plat/backlight.h +++ b/arch/arm/plat-samsung/include/plat/backlight.h @@ -20,7 +20,7 @@ struct samsung_bl_gpio_info { int func; }; -extern void samsung_bl_set(struct samsung_bl_gpio_info *gpio_info, +extern void __init samsung_bl_set(struct samsung_bl_gpio_info *gpio_info, struct platform_pwm_backlight_data *bl_data); #endif /* __ASM_PLAT_BACKLIGHT_H */ diff --git a/arch/arm/plat-samsung/irq-vic-timer.c b/arch/arm/plat-samsung/irq-vic-timer.c index f714d060370d..51583cd30164 100644 --- a/arch/arm/plat-samsung/irq-vic-timer.c +++ b/arch/arm/plat-samsung/irq-vic-timer.c @@ -22,9 +22,14 @@ #include <plat/irq-vic-timer.h> #include <plat/regs-timer.h> +#include <asm/mach/irq.h> + static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc) { + struct irq_chip *chip = irq_get_chip(irq); + chained_irq_enter(chip, desc); generic_handle_irq((int)desc->irq_data.handler_data); + chained_irq_exit(chip, desc); } /* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */ |