diff mbox

pali's n900 tree: fix compilation

Message ID 20130708120443.GA2158@amd.pavel.ucw.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Pavel Machek July 8, 2013, 12:04 p.m. UTC 
Hi!

This fixes compilation w/o CONFIG_TWL4030_MADC.

Please apply :-).

Signed-off-by: Pavel Machek <pavel@ucw.cz>

Comments

Pali Rohár July 8, 2013, 12:19 p.m. UTC | #1 
On Monday 08 July 2013 14:04:43 Pavel Machek wrote:
> Hi!
> 
> This fixes compilation w/o CONFIG_TWL4030_MADC.
> 
> Please apply :-).
> 
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
> 
> diff --git a/arch/arm/mach-omap2/board-rx51-compat.c
> b/arch/arm/mach-omap2/board-rx51-compat.c index
> ceabe8b..f3a82a3 100644

Commited to branch v3.10-n900:
https://gitorious.org/linux-n900/linux-n900/commit/d5da1f5357345ad270a491ce285c78dcf901a7ff

File board-rx51-compat.c contains only maemo5 specified userspace
interfaces. Nothing which can go to upstream. Once if all these interfaces
are removed from maemo5 (CSSU), I will remove them also from my git tree.
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-rx51-compat.c b/arch/arm/mach-omap2/board-rx51-compat.c
index ceabe8b..f3a82a3 100644
--- a/arch/arm/mach-omap2/board-rx51-compat.c
+++ b/arch/arm/mach-omap2/board-rx51-compat.c
@@ -125,6 +125,7 @@  static long twl4030_madc_ioctl(struct file *filp, unsigned int cmd,
 	}
 
 	switch (cmd) {
+#ifdef CONFIG_TWL4030_MADC
 	case TWL4030_MADC_IOCX_ADC_RAW_READ: {
 		struct twl4030_madc_request req;
 		if (par.channel >= TWL4030_MADC_MAX_CHANNELS)
@@ -148,6 +149,7 @@  static long twl4030_madc_ioctl(struct file *filp, unsigned int cmd,
 		}
 		break;
 	}
+#endif
 	default:
 		return -EINVAL;
 	}