diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:15:25 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:15:25 +0900 |
| commit | b127c6fb508f86542c3d5e460e1b99d2294360a6 (patch) | |
| tree | e316ea74828176f6a02713ade6b67a0766cd801b /arch/arm/mach-s3c2416/irq.c | |
| parent | 0a66a59649f8d3f09a0ca77f1a232ec77adeeda2 (diff) | |
| parent | 9adf262a9f81489635f7868c9819cb864192811b (diff) | |
| download | linux-b127c6fb508f86542c3d5e460e1b99d2294360a6.tar.gz linux-b127c6fb508f86542c3d5e460e1b99d2294360a6.tar.bz2 linux-b127c6fb508f86542c3d5e460e1b99d2294360a6.zip | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S5PV210: Fix sysdev related warning messages
ARM: S3C24XX: Fix UART3 submask on S3C2416 and S3C2443
ARM: S3C24XX: Fix Demux error in UART3 irqs on S3C2443 and S3C2416
ARM: S3C64XX: fix uart clock setup for mini6410/real6410
ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull
ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changes
Diffstat (limited to 'arch/arm/mach-s3c2416/irq.c')
| -rw-r--r-- | arch/arm/mach-s3c2416/irq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c index 084d121f368c..00174daf1526 100644 --- a/arch/arm/mach-s3c2416/irq.c +++ b/arch/arm/mach-s3c2416/irq.c @@ -168,12 +168,11 @@ static struct irq_chip s3c2416_irq_dma = { static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc) { - s3c2416_irq_demux(IRQ_S3C2443_UART3, 3); + s3c2416_irq_demux(IRQ_S3C2443_RX3, 3); } #define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0)) -#define SUBMSK_UART3 (0xf << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) - +#define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) static void s3c2416_irq_uart3_mask(unsigned int irqno) { |