Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / arch / arm / mach-mv78xx0 / mpp.c

diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c
index 4da82f85d1ce98ac79c749abed69f8a6719a1735..df50342179e2de45053db13c92d3cc5132be83fd 100644 (file)
--- a/arch/arm/mach-mv78xx0/mpp.c
+++ b/arch/arm/mach-mv78xx0/mpp.c
@@ -33,6 +33,5 @@ static unsigned int __init mv78xx0_variant(void)
 void __init mv78xx0_mpp_conf(unsigned int *mpp_list)
 {
        orion_mpp_conf(mpp_list, mv78xx0_variant(),
-                      MPP_MAX,
-                      (unsigned long) DEV_BUS_VIRT_BASE);
+                      MPP_MAX, DEV_BUS_VIRT_BASE);
 }