Merge branch 'linus' into x86/header-guards

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

diff --git a/include/asm-arm/arch-pxa/mfp-pxa300.h b/include/asm-arm/arch-pxa/mfp-pxa300.h
index a209966498897848f319e7d340efdee8a255b3f0..bb410313556fe560f2152071773cb1403dc0cf1a 100644 (file)
--- a/include/asm-arm/arch-pxa/mfp-pxa300.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa300.h
@@ -16,6 +16,7 @@
 #define __ASM_ARCH_MFP_PXA300_H
 
 #include <asm/arch/mfp.h>
+#include <asm/arch/mfp-pxa3xx.h>
 
 /* GPIO */
 #define GPIO46_GPIO            MFP_CFG(GPIO46, AF1)