git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
eukrea_mbimx51-baseboard.c
diff --git
a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
index
bbf4564
..
a6a3ab8
100644
(file)
--- a/
arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
+++ b/
arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
@@
-28,7
+28,6
@@
#include <asm/mach/arch.h>
#include "devices-imx51.h"
#include <asm/mach/arch.h>
#include "devices-imx51.h"
-#include "devices.h"
#define MBIMX51_TSC2007_GPIO IMX_GPIO_NR(3, 30)
#define MBIMX51_LED0 IMX_GPIO_NR(3, 5)
#define MBIMX51_TSC2007_GPIO IMX_GPIO_NR(3, 30)
#define MBIMX51_LED0 IMX_GPIO_NR(3, 5)
@@
-160,7
+159,7
@@
struct tsc2007_platform_data tsc2007_data = {
static struct i2c_board_info mbimx51_i2c_devices[] = {
{
I2C_BOARD_INFO("tsc2007", 0x49),
static struct i2c_board_info mbimx51_i2c_devices[] = {
{
I2C_BOARD_INFO("tsc2007", 0x49),
- .irq =
gpio_to_irq
(MBIMX51_TSC2007_GPIO),
+ .irq =
IMX_GPIO_TO_IRQ
(MBIMX51_TSC2007_GPIO),
.platform_data = &tsc2007_data,
}, {
I2C_BOARD_INFO("tlv320aic23", 0x1a),
.platform_data = &tsc2007_data,
}, {
I2C_BOARD_INFO("tlv320aic23", 0x1a),