Merge branch 'fix/misc' into for-linus

[mv-sheeva.git] / arch / arm / mach-omap2 / mux.h

diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index bebe9cc60858d6472ae883ed1a91f1cc1c5dce19..d8b4d5ad22783ffe342611ba801a07a709ce6b18 100644 (file)
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -7,6 +7,8 @@
  * published by the Free Software Foundation.
  */
 
+#include "mux34xx.h"
+
 #define OMAP_MUX_TERMINATOR    0xffff
 
 /* 34xx mux mode options for each pin. See TRM for options */
@@ -54,6 +56,7 @@
 
 /* Flags for omap_mux_init */
 #define OMAP_PACKAGE_MASK              0xffff
+#define OMAP_PACKAGE_CBP               4               /* 515-pin 0.40 0.50 */
 #define OMAP_PACKAGE_CUS               3               /* 423-pin 0.65 */
 #define OMAP_PACKAGE_CBB               2               /* 515-pin 0.40 0.50 */
 #define OMAP_PACKAGE_CBC               1               /* 515-pin 0.50 0.65 */