---

yaml --- r: 189626 b: refs/heads/master c: 5eb2e89 h: refs/heads/master v: v3
git-mirror · Apr 5, 2010 · 72d2b39 · 72d2b39
1 parent ccb2c9a
commit 72d2b39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d99c3871148cb643cffe138e9427b7a743aca367
+refs/heads/master: 5eb2e891f038c8e04757f4536b9693faf35978a3
diff --git a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -144,6 +144,10 @@ extern const short da850_mmcsd0_pins[];
 extern const short da850_nand_pins[];
 extern const short da850_nor_pins[];
 
+#ifdef CONFIG_DAVINCI_MUX
 int da8xx_pinmux_setup(const short pins[]);
+#else
+static inline int da8xx_pinmux_setup(const short pins[]) { return 0; }
+#endif
 
 #endif /* __ASM_ARCH_DAVINCI_DA8XX_H */