Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / arch / arm / plat-omap / include / mach / aic23.h

diff --git a/arch/arm/plat-omap/include/mach/aic23.h b/arch/arm/plat-omap/include/mach/aic23.h
index 5ccedac..188fe8b 100644 (file)
--- a/arch/arm/plat-omap/include/mach/aic23.h
+++ b/arch/arm/plat-omap/include/mach/aic23.h
@@ -110,7 +110,17 @@
 #define TLV320AIC23ID1                  (0x1a) // cs low
 #define TLV320AIC23ID2                  (0x1b) // cs high
 
-void aic23_power_up(void);
-void aic23_power_down(void);
+#ifdef CONFIG_SENSORS_TLV320AIC23
+extern void aic23_power_up(void);
+extern void aic23_power_down(void);
+#else
+static inline void aic23_power_up(void)
+{
+}
+
+static inline void aic23_power_down(void)
+{
+}
+#endif
 
 #endif /* __ASM_ARCH_AIC23_H */