Hi Uwe,

On Mon, Aug 02, 2010 at 11:14:17AM +0200, Uwe Kleine-König wrote:
quoted text
> This is needed for the mc13783-adc driver to decide if a touch screen is
> connected.  If so some channels are not available as generic hwmon inputs.
Looks good to me, applied to my for-next branch.

Now that we're at it, could we then move mc13783-private.h from include/linux/
to driver/mfd ?

Cheers,
Samuel.


quoted text
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/mfd/mc13783-core.c  |    6 ++++++
>  include/linux/mfd/mc13783.h |    2 ++
>  2 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c
> index ead84e4..a4fa191 100644
> --- a/drivers/mfd/mc13783-core.c
> +++ b/drivers/mfd/mc13783-core.c
> @@ -226,6 +226,12 @@ int mc13783_reg_rmw(struct mc13783 *mc13783, unsigned int offset,
>  }
>  EXPORT_SYMBOL(mc13783_reg_rmw);
>  
> +int mc13783_get_flags(struct mc13783 *mc13783)
> +{
> +	return mc13783->flags;
> +}
> +EXPORT_SYMBOL(mc13783_get_flags);
> +
>  int mc13783_irq_mask(struct mc13783 *mc13783, int irq)
>  {
>  	int ret;
> diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h
> index 4a894f6..0fa44fb 100644
> --- a/include/linux/mfd/mc13783.h
> +++ b/include/linux/mfd/mc13783.h
> @@ -21,6 +21,8 @@ int mc13783_reg_write(struct mc13783 *mc13783, unsigned int offset, u32 val);
>  int mc13783_reg_rmw(struct mc13783 *mc13783, unsigned int offset,
>  		u32 mask, u32 val);
>  
> +int mc13783_get_flags(struct mc13783 *mc13783);
> +
>  int mc13783_irq_request(struct mc13783 *mc13783, int irq,
>  		irq_handler_t handler, const char *name, void *dev);
>  int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq,
> -- 
> 1.7.1
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/