diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:33:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:33:54 -0500 |
| commit | 602fd7c36728a04e61a442c9755e7d454501266c (patch) | |
| tree | 6be77464bd07934a40959d68e5d08d75829bdc49 /arch/arm/mach-s5pc100/include/mach/irqs.h | |
| parent | d7931d9f7ab9de9158c6905caae979999134ad4d (diff) | |
| parent | 88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff) | |
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/irqs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h index 622720dba28..b53fa48a52c 100644 --- a/arch/arm/mach-s5pc100/include/mach/irqs.h +++ b/arch/arm/mach-s5pc100/include/mach/irqs.h | |||
| @@ -11,4 +11,9 @@ | |||
| 11 | 11 | ||
| 12 | #include <plat/irqs.h> | 12 | #include <plat/irqs.h> |
| 13 | 13 | ||
| 14 | /* LCD */ | ||
| 15 | #define IRQ_LCD_FIFO IRQ_LCD0 | ||
| 16 | #define IRQ_LCD_VSYNC IRQ_LCD1 | ||
| 17 | #define IRQ_LCD_SYSTEM IRQ_LCD2 | ||
| 18 | |||
| 14 | #endif /* __ASM_ARCH_IRQ_H */ | 19 | #endif /* __ASM_ARCH_IRQ_H */ |