aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authormerge <null@invalid>2009-01-21 20:02:15 +0000
committerAndy Green <agreen@octopus.localdomain>2009-01-21 20:02:15 +0000
commit7290f1e64b89005cec72c0b948f9ac9fd43263bb (patch)
tree15e969bf64df737c38c53bf156baea1436b7a836 /include/linux
parent19104094f6dcc618fdc930cad1dc4ab0c70dff00 (diff)
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-glamo-don-t-break-kernel-build-1232567797
pending-tracking-hist top was MERGE-via-stable-tracking-glamo-don-t-break-kernel-build-1232567797 / d9aa2ec4d0f11979eb9894dbcf0c1639e73a7587 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-glamo-don-t-break-kernel-build stable-tracking-hist top was glamo-don-t-break-kernel-build / 1796c97b437a7bb998c489caba09a026bbb16564 ... parent commitmessage: From: Werner Almesberger <werner@openmoko.org> Glamo: don't break kernel build if disabled If we disable CONFIG_MFD_GLAMO, a dependency on glamo_lcm_reset from arch/arm/mach-s3c2440/mach-gta02.c:gta02_jbt6k74_reset cannot be resolved. There are many ways to fix this - this one does it with a bit of a swagger ;-) Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/glamofb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
index b787a0c7041..507b67c8099 100644
--- a/include/linux/glamofb.h
+++ b/include/linux/glamofb.h
@@ -40,6 +40,11 @@ struct glamofb_platform_data {
int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
+
+#ifdef CONFIG_MFD_GLAMO
void glamo_lcm_reset(int level);
+#else
+#define glamo_lcm_reset(...) do {} while (0)
+#endif
#endif