lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus

Browse Source
This commit is contained in:
Russell King
2011-10-25 08:19:29 +01:00
parent c3b92c8787 7816e210a7 f73765fcb8 70e5f5efcc 91c2ebb90b daece59689 d7c5d0dcff a06f916b7a
commit 06afb1a087
76 changed files with 1282 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/common/vic.c
View File

@@ -346,7 +346,8 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,
/* Identify which VIC cell this one is, by reading the ID */
for (i = 0; i < 4; i++) {
u32 addr = ((u32)base & PAGE_MASK) + 0xfe0 + (i * 4);
void __iomem *addr;
addr = (void __iomem *)((u32)base & PAGE_MASK) + 0xfe0 + (i * 4);
cellid |= (readl(addr) & 0xff) << (8 * i);
}
vendor = (cellid >> 12) & 0xff;