diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /arch/arm/plat-s3c64xx/irq.c | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/plat-s3c64xx/irq.c')
| -rw-r--r-- | arch/arm/plat-s3c64xx/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/irq.c b/arch/arm/plat-s3c64xx/irq.c index a94f1d5e819d..f22edf7c2d2d 100644 --- a/arch/arm/plat-s3c64xx/irq.c +++ b/arch/arm/plat-s3c64xx/irq.c | |||
| @@ -207,7 +207,7 @@ static struct irq_chip s3c_irq_uart = { | |||
| 207 | 207 | ||
| 208 | static void __init s3c64xx_uart_irq(struct uart_irq *uirq) | 208 | static void __init s3c64xx_uart_irq(struct uart_irq *uirq) |
| 209 | { | 209 | { |
| 210 | void *reg_base = uirq->regs; | 210 | void __iomem *reg_base = uirq->regs; |
| 211 | unsigned int irq; | 211 | unsigned int irq; |
| 212 | int offs; | 212 | int offs; |
| 213 | 213 | ||