Re: [PATCH V3 2/2] omap4: platform changes for CMA3000

[Tony Lindgren]

* Hemanth V <hemanthv@xxxxxx> [100907 23:11]:
> From 8082870cc704d901d98cf0d6af90e45860927ceb Mon Sep 17 00:00:00 2001
> From: Hemanth V <hemanthv@xxxxxx>
> Date: Thu, 26 Aug 2010 17:49:12 +0530
> Subject: [PATCH] Platform changes for CMA3000 Accelerometer driver
> 
> Update 4430 SDP board file with platform data for accelerometer driver
> and select the driver in kconfig
> 
> Signed-off-by: Hemanth V <hemanthv@xxxxxx>
> ---
>  arch/arm/mach-omap2/Kconfig         |    2 ++
>  arch/arm/mach-omap2/board-4430sdp.c |   30 ++++++++++++++++++++++++++++++
>  2 files changed, 32 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index a928fd6..e87c049 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -255,6 +255,8 @@ config MACH_OMAP_4430SDP
>  	depends on ARCH_OMAP4
>  	select INPUT_TOUCHSCREEN
>  	select TOUCHSCREEN_SYNTM12XX
> +	select INPUT_MISC
> + 	select INPUT_CMA3000_I2C
> 
>  config MACH_OMAP4_PANDA
>  	bool "OMAP4 Panda Board"

This does not apply, can you please refresh against the current
devel-boards branch in the linux-omap tree. I'm getting:

patching file arch/arm/mach-omap2/Kconfig
Hunk #1 FAILED at 255.
1 out of 1 hunk FAILED -- rejects in file arch/arm/mach-omap2/Kconfig
patching file arch/arm/mach-omap2/board-4430sdp.c
Hunk #2 FAILED at 46.
Hunk #3 succeeded at 441 (offset -46 lines).
Hunk #4 succeeded at 479 with fuzz 2 (offset -62 lines).
Hunk #5 succeeded at 518 (offset -80 lines).
1 out of 5 hunks FAILED -- rejects in file arch/arm/mach-omap2/board-4430sdp.c
Patch apply does not apply (enforce with -f)

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/