summaryrefslogtreecommitdiff
path: root/include/linux/input
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2011-01-31 04:17:03 +0000
committerSteve French <sfrench@us.ibm.com>2011-01-31 04:17:03 +0000
commit58b8a5b45a097b477c037bc376e65dc5f214bf3d (patch)
tree9fa2538a113fbd3aaa322d9c972aca3ca16b7e30 /include/linux/input
parentffeb414a59291d5891f09727beb793c109f19f08 (diff)
parent70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/input')
-rw-r--r--include/linux/input/bu21013.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/input/bu21013.h b/include/linux/input/bu21013.h
index e470d387dd49..05e03284b92a 100644
--- a/include/linux/input/bu21013.h
+++ b/include/linux/input/bu21013.h
@@ -12,8 +12,6 @@
* @cs_en: pointer to the cs enable function
* @cs_dis: pointer to the cs disable function
* @irq_read_val: pointer to read the pen irq value function
- * @x_max_res: xmax resolution
- * @y_max_res: ymax resolution
* @touch_x_max: touch x max
* @touch_y_max: touch y max
* @cs_pin: chip select pin
@@ -29,8 +27,6 @@ struct bu21013_platform_device {
int (*cs_en)(int reset_pin);
int (*cs_dis)(int reset_pin);
int (*irq_read_val)(void);
- int x_max_res;
- int y_max_res;
int touch_x_max;
int touch_y_max;
unsigned int cs_pin;