---

yaml --- r: 326597 b: refs/heads/master c: 5fa1a2e h: refs/heads/master i: 326595: d21d8d2 v: v3
git-mirror · Sep 19, 2012 · 64e2484 · 64e2484
1 parent aefd8e2
commit 64e2484
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 009a01e347b91123c13e85d70b9b4fbc72c67bfd
+refs/heads/master: 5fa1a2e12a3bc7614db7b5f5f4b1167e5e25a9e6
diff --git a/trunk/arch/arm/plat-samsung/s5p-irq-gpioint.c b/trunk/arch/arm/plat-samsung/s5p-irq-gpioint.c
@@ -24,7 +24,7 @@
 
 #include <asm/mach/irq.h>
 
-#define GPIO_BASE(chip)		(((unsigned long)(chip)->base) & 0xFFFFF000u)
+#define GPIO_BASE(chip)		((void __iomem *)((unsigned long)((chip)->base) & 0xFFFFF000u))
 
 #define CON_OFFSET		0x700
 #define MASK_OFFSET		0x900
@@ -153,7 +153,7 @@ static __init int s5p_gpioint_add(struct samsung_gpio_chip *chip)
 	bank->chips[group - bank->start] = chip;
 
 	gc = irq_alloc_generic_chip("s5p_gpioint", 1, chip->irq_base,
-				    (void __iomem *)GPIO_BASE(chip),
+				    GPIO_BASE(chip),
 				    handle_level_irq);
 	if (!gc)
 		return -ENOMEM;