From 3a315ed0a09178fa9bfaecafd831436f0f2b2774 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 3 Mar 2008 01:31:32 -0800
Subject: [PATCH] --- yaml --- r: 87288 b: refs/heads/master c:
 09be7553959c9947f7cbccbe1c3094bb2e3ffd28 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/include/asm-arm/arch-omap/gpioexpander.h | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d0af9fda830..399f4852fafa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cc0a441163b92fbda5fe1886cb6e9876cf08f40
+refs/heads/master: 09be7553959c9947f7cbccbe1c3094bb2e3ffd28
diff --git a/trunk/include/asm-arm/arch-omap/gpioexpander.h b/trunk/include/asm-arm/arch-omap/gpioexpander.h
index 7a43b0a912e4..4eed1f80e2fb 100644
--- a/trunk/include/asm-arm/arch-omap/gpioexpander.h
+++ b/trunk/include/asm-arm/arch-omap/gpioexpander.h
@@ -18,7 +18,18 @@
 
 /* Function Prototypes for GPIO Expander functions */
 
+#ifdef CONFIG_GPIOEXPANDER_OMAP
 int read_gpio_expa(u8 *, int);
 int write_gpio_expa(u8 , int);
+#else
+static inline int read_gpio_expa(u8 *val, int addr)
+{
+	return 0;
+}
+static inline int write_gpio_expa(u8 val, int addr)
+{
+	return 0;
+}
+#endif
 
 #endif /* __ASM_ARCH_OMAP_GPIOEXPANDER_H */