diff options
| author |   Sekhar Nori <nsekhar@ti.com> | 2010-03-10 15:11:24 +0530 |
|---|---|---|
| committer |   Kevin Hilman <khilman@deeprootsystems.com> | 2010-04-05 15:25:11 -0700 |
| commit | 5eb2e891f038c8e04757f4536b9693faf35978a3 (patch) | |
| tree | 5be8237b1c8f79de629b9d32dac51920edefdad1 /arch/arm | |
| parent | davinci: timers: don't enable timer until clocksource is initialized (diff) | |
| download | linux-dev-5eb2e891f038c8e04757f4536b9693faf35978a3.tar.xz linux-dev-5eb2e891f038c8e04757f4536b9693faf35978a3.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | 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 cc9be7fee627..b87a6ba0de3c 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 */ |