linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* pali's n900 tree: fix compilation
@ 2013-07-08 12:04 Pavel Machek
  2013-07-08 12:19 ` Pali Rohár
  0 siblings, 1 reply; 2+ messages in thread
From: Pavel Machek @ 2013-07-08 12:04 UTC (permalink / raw)
  To: linux-arm-kernel

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
--- 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;
 	}

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* pali's n900 tree: fix compilation
  2013-07-08 12:04 pali's n900 tree: fix compilation Pavel Machek
@ 2013-07-08 12:19 ` Pali Rohár
  0 siblings, 0 replies; 2+ messages in thread
From: Pali Rohár @ 2013-07-08 12:19 UTC (permalink / raw)
  To: linux-arm-kernel

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.

-- 
Pali Roh?r
pali.rohar at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130708/f0c8a6f8/attachment.sig>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-07-08 12:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-08 12:04 pali's n900 tree: fix compilation Pavel Machek
2013-07-08 12:19 ` Pali Rohár

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).