Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6135434a authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards... 


omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad

Only mach-omap2 boards are currently using matrix_keypad. Allow
mach-omap1 boards to use the old style keypad.h without breaking.

Created against linux-2.6.32-rc5.
Compile tested with omap_3430sdp_defconfig and rx51_defconfig.

Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 012abeea

arch/arm/mach-omap2/board-3430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/i2c/twl4030.h>
@@ -38,7 +39,6 @@ 
#include <mach/gpmc.h>



#include <mach/control.h>

#include <mach/keypad.h>

#include <mach/gpmc-smc91x.h>



#include "sdram-qimonda-hyb18m512160af-6.h"

arch/arm/mach-omap2/board-ldp.c

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/gpio_keys.h>

#include <linux/workqueue.h>

#include <linux/err.h>
@@ -41,7 +42,6 @@ 
#include <asm/delay.h>

#include <mach/control.h>

#include <mach/usb.h>

#include <mach/keypad.h>



#include "mmc-twl4030.h"

arch/arm/mach-omap2/board-omap3evm.c

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/leds.h>



#include <linux/spi/spi.h>
@@ -37,7 +38,6 @@ 
#include <mach/usb.h>

#include <mach/common.h>

#include <mach/mcspi.h>

#include <mach/keypad.h>



#include "sdram-micron-mt46h32m32lf-6.h"

#include "mmc-twl4030.h"

arch/arm/mach-omap2/board-omap3pandora.c

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/i2c/twl4030.h>

#include <linux/leds.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/gpio_keys.h>



#include <asm/mach-types.h>
@@ -39,7 +40,6 @@ 
#include <mach/hardware.h>

#include <mach/mcspi.h>

#include <mach/usb.h>

#include <mach/keypad.h>

#include <mach/mux.h>



#include "sdram-micron-mt46h32m32lf-6.h"

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/i2c.h>

#include <linux/i2c/twl4030.h>
@@ -27,7 +28,6 @@ 
#include <mach/common.h>

#include <mach/dma.h>

#include <mach/gpmc.h>

#include <mach/keypad.h>

#include <mach/onenand.h>

#include <mach/gpmc-smc91x.h>