diff options
| author | Evan Wilson <evan@oliodevices.com> | 2014-11-26 16:45:11 -0800 | 
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-11-26 16:45:11 -0800 | 
| commit | ee0be5d9ca8c41c69bb4283e96ffc872875b9ba8 (patch) | |
| tree | 2f7247ad51300ef772c5e21994fc74e502a10efd /arch | |
| parent | b15944ba232c8e0198e8086b4d4372a6fbd9dc87 (diff) | |
| parent | 15fd4c4259d19d0005d9cccb6ab2f85fbd4d6a02 (diff) | |
| download | olio-linux-3.10-ee0be5d9ca8c41c69bb4283e96ffc872875b9ba8.tar.xz olio-linux-3.10-ee0be5d9ca8c41c69bb4283e96ffc872875b9ba8.zip  | |
Merge remote-tracking branch 'atmel-maxtouch/maxtouch-v3.10' into android-3.10-bringup
Change-Id: Iea94511ceb93f68a94a9e57d5651c1e01dfe6f71
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 8 | 
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 30b24ad84f4..8ebc41a7243 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -239,14 +239,6 @@ static void __init goni_radio_init(void)  /* TSP */  static struct mxt_platform_data qt602240_platform_data = { -	.x_line		= 17, -	.y_line		= 11, -	.x_size		= 800, -	.y_size		= 480, -	.blen		= 0x21, -	.threshold	= 0x28, -	.voltage	= 2800000,              /* 2.8V */ -	.orient		= MXT_DIAGONAL,  	.irqflags	= IRQF_TRIGGER_FALLING,  };  |