Merge branch 'linus' into x86/header-guards

[firefly-linux-kernel-4.4.55.git] / include / asm-arm / arch-pxa / mfp-pxa320.h

diff --git a/include/asm-arm/arch-pxa/mfp-pxa320.h b/include/asm-arm/arch-pxa/mfp-pxa320.h
index ae8ba34194cf6f81a74541cd70f93857712440c6..576aa46d90fcc6fe1777d3642facb8274e751d99 100644 (file)
--- a/include/asm-arm/arch-pxa/mfp-pxa320.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa320.h
@@ -4,7 +4,7 @@
  * PXA320 specific MFP configuration definitions
  *
  * Copyright (C) 2007 Marvell International Ltd.
- * 2007-08-21: eric miao <eric.y.miao@gmail.com>
+ * 2007-08-21: eric miao <eric.miao@marvell.com>
  *             initial version
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,10 @@
 #define __ASM_ARCH_MFP_PXA320_H
 
 #include <asm/arch/mfp.h>
+#include <asm/arch/mfp-pxa3xx.h>
 
 /* GPIO */
-#define GPIO46_GPIO            MFP_CFG(GPIO6, AF0)
+#define GPIO46_GPIO            MFP_CFG(GPIO46, AF0)
 #define GPIO49_GPIO            MFP_CFG(GPIO49, AF0)
 #define GPIO50_GPIO            MFP_CFG(GPIO50, AF0)
 #define GPIO51_GPIO            MFP_CFG(GPIO51, AF0)