Merge branches 'release' and 'menlo' into release

[linux-2.6-omap-h63xx.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 52deedcaf3bd5fe3ebb9aa966302b49e3b729bc0..576aa46d90fcc6fe1777d3642facb8274e751d99 100644 (file)
--- a/include/asm-arm/arch-pxa/mfp-pxa320.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa320.h
@@ -16,6 +16,7 @@
 #define __ASM_ARCH_MFP_PXA320_H
 
 #include <asm/arch/mfp.h>
+#include <asm/arch/mfp-pxa3xx.h>
 
 /* GPIO */
 #define GPIO46_GPIO            MFP_CFG(GPIO46, AF0)