diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 22:15:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 22:15:30 +0000 |
| commit | fdb0a1a67e131f07a308730c80d07e330211d2e0 (patch) | |
| tree | 4fbf35055fc965737c1ffdbcfe98d7ea8335f940 /arch/arm/common | |
| parent | fc0b7a20368193e1f7cf1376624eed419b9c33e6 (diff) | |
| parent | 7bb56d01f111890414fbe35412698485b68ed468 (diff) | |
| download | op-kernel-dev-fdb0a1a67e131f07a308730c80d07e330211d2e0.zip op-kernel-dev-fdb0a1a67e131f07a308730c80d07e330211d2e0.tar.gz | |
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/vic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index f1e4b8f..ecf0bfb 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c @@ -69,12 +69,12 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, /* * Make sure we clear all existing interrupts */ - writel(0, base + VIC_VECT_ADDR); + writel(0, base + VIC_PL190_VECT_ADDR); for (i = 0; i < 19; i++) { unsigned int value; - value = readl(base + VIC_VECT_ADDR); - writel(value, base + VIC_VECT_ADDR); + value = readl(base + VIC_PL190_VECT_ADDR); + writel(value, base + VIC_PL190_VECT_ADDR); } for (i = 0; i < 16; i++) { @@ -82,7 +82,7 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, writel(VIC_VECT_CNTL_ENABLE | i, reg); } - writel(32, base + VIC_DEF_VECT_ADDR); + writel(32, base + VIC_PL190_DEF_VECT_ADDR); for (i = 0; i < 32; i++) { unsigned int irq = irq_start + i; |
