Gitweb:     http://git.kernel.org/linus/5eb2e891f038c8e04757f4536b9693faf35978a3
Commit:     5eb2e891f038c8e04757f4536b9693faf35978a3
Parent:     d99c3871148cb643cffe138e9427b7a743aca367
Author:     Sekhar Nori <nsekhar@ti.com>
AuthorDate: Wed Mar 10 15:11:24 2010 +0530
Committer:  Kevin Hilman <khilman@deeprootsystems.com>
CommitDate: Mon Apr 5 15:25:11 2010 -0700

    davinci: da8xx/omap-l1: fix build error when CONFIG_DAVINCI_MUX is undefined
    
    The da8xx/omap-l1 boards refuse to build when CONFIG_DAVINCI_MUX is undefined
    because arch/arm/mach-davinci/mux.c:da8xx_pinmux_setup() is not defined.
    
    This patch fixes this issue. This is build tested with davinci_all_defconfig
    and da8xx_omapl_defconfig and boot tested on DA830 EVM.
    
    Reported-by: Shanmuga Sundaram Mahendran <shanmuga@ti.com>
    Signed-off-by: Sekhar Nori <nsekhar@ti.com>
    Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-davinci/include/mach/da8xx.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index cc9be7f..b87a6ba 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/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 */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html