Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / aic23.h

diff --git a/include/asm-arm/arch-omap/aic23.h b/arch/arm/plat-omap/include/mach/aic23.h
similarity index 93%
rename from include/asm-arm/arch-omap/aic23.h
rename to arch/arm/plat-omap/include/mach/aic23.h
index aec2d65636229a5a49b05e970481eaf2386986db..188fe8b1308892feb5c4c82c5eef49ead206c7da 100644 (file)
--- a/include/asm-arm/arch-omap/aic23.h
+++ b/arch/arm/plat-omap/include/mach/aic23.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/aic23.h
+ * arch/arm/plat-omap/include/mach/aic23.h
  *
  * Hardware definitions for TI TLV320AIC23 audio codec
  *
@@ -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 */