X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=blobdiff_plain;f=arch%2Farm%2Fplat-omap%2Finclude%2Fmach%2Fgpio-switch.h;fp=arch%2Farm%2Fplat-omap%2Finclude%2Fmach%2Fgpio-switch.h;h=2096780660937ceef27eb24e0b437ab32af88bc1;hp=10da0e07c0cf8998b926a3680b042936e77e5129;hb=b934c987ee1764eb09b8843a3ee00eabc24bd52c;hpb=14fc69723d3442ef46f8f82b3f481e82f06a346d

diff --git a/arch/arm/plat-omap/include/mach/gpio-switch.h b/arch/arm/plat-omap/include/mach/gpio-switch.h
index 10da0e07c0c..20967806609 100644
--- a/arch/arm/plat-omap/include/mach/gpio-switch.h
+++ b/arch/arm/plat-omap/include/mach/gpio-switch.h
@@ -24,11 +24,12 @@
  *	low  -> inactive
  *
  */
-#define OMAP_GPIO_SWITCH_TYPE_COVER		0x0000
-#define OMAP_GPIO_SWITCH_TYPE_CONNECTION	0x0001
-#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY		0x0002
-#define OMAP_GPIO_SWITCH_FLAG_INVERTED		0x0001
-#define OMAP_GPIO_SWITCH_FLAG_OUTPUT		0x0002
+#define OMAP_GPIO_SWITCH_TYPE_COVER			0x0000
+#define OMAP_GPIO_SWITCH_TYPE_CONNECTION		0x0001
+#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY			0x0002
+#define OMAP_GPIO_SWITCH_FLAG_INVERTED			0x0001
+#define OMAP_GPIO_SWITCH_FLAG_OUTPUT			0x0002
+#define OMAP_GPIO_SWITCH_FLAG_OUTPUT_INIT_ACTIVE	0x0004
 
 struct omap_gpio_switch {
 	const char *name;
@@ -48,7 +49,11 @@ struct omap_gpio_switch {
 };
 
 /* Call at init time only */
+#ifdef CONFIG_OMAP_GPIO_SWITCH
 extern void omap_register_gpio_switches(const struct omap_gpio_switch *tbl,
 					int count);
+#else
+#define omap_register_gpio_switches(tbl, count)	do { } while (0)
+#endif
 
 #endif