From 7290f1e64b89005cec72c0b948f9ac9fd43263bb Mon Sep 17 00:00:00 2001 From: merge Date: Wed, 21 Jan 2009 20:02:15 +0000 Subject: 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 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 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 --- include/linux/glamofb.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') 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 -- cgit v1.2.3