2009-09-26 11:52:43

by Pavel Machek

[permalink] [raw]
Subject: Re: Staging: dream: fix build errorsg

On Wed 2009-09-16 10:48:03, Greg KH wrote:
> On Fri, Sep 11, 2009 at 11:27:52PM +0200, Pavel Machek wrote:
> >
> > Fix compilation of gpio_* input drivers on -next kernel. Adds needed
> > headers and removes unprotected wakelock/earlysuspend dependencies.
> >
> > Signed-off-by: Pavel Machek <[email protected]>
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> >
> > ---
> > drivers/staging/dream/gpio_event.c | 3
> > drivers/staging/dream/gpio_input.c | 7 -
> > drivers/staging/dream/gpio_matrix.c | 8 -
> > include/linux/gpio_event.h | 154 ++++++++++++++++++++++++++++++++++++
>
> This adds a file outside of the staging tree, so I'm going to drop it,
> sorry.

Ok, whats the preffered solution here? Create staging/include/linux
and add gcc -I magic so it gets used?
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html


2009-09-26 18:48:37

by Daniel Walker

[permalink] [raw]
Subject: Re: Staging: dream: fix build errorsg

On Sat, 2009-09-26 at 13:44 +0200, Pavel Machek wrote:
> On Wed 2009-09-16 10:48:03, Greg KH wrote:
> > On Fri, Sep 11, 2009 at 11:27:52PM +0200, Pavel Machek wrote:
> > >
> > > Fix compilation of gpio_* input drivers on -next kernel. Adds needed
> > > headers and removes unprotected wakelock/earlysuspend dependencies.
> > >
> > > Signed-off-by: Pavel Machek <[email protected]>
> > > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> > >
> > > ---
> > > drivers/staging/dream/gpio_event.c | 3
> > > drivers/staging/dream/gpio_input.c | 7 -
> > > drivers/staging/dream/gpio_matrix.c | 8 -
> > > include/linux/gpio_event.h | 154 ++++++++++++++++++++++++++++++++++++
> >
> > This adds a file outside of the staging tree, so I'm going to drop it,
> > sorry.
>
> Ok, whats the preffered solution here? Create staging/include/linux
> and add gcc -I magic so it gets used?

Could we do drivers/staging/include/ then make a link from
include/staging/ (or something) into the drivers/staging include
directory at build time?

The lower level msm sub-architecture already links to includes directly
into the staging directory like this,

#include <../../../drivers/staging/android/timed_gpio.h>

which looks pretty ugly ..

Daniel