From 96e7d189f65df991a4b4804f7ad8c8c09dc480a4 Mon Sep 17 00:00:00 2001
From: Om Prakash <omprakash.pal@stericsson.com>
Date: Mon, 27 Jun 2011 09:54:22 +0200
Subject: [PATCH] --- yaml --- r: 261887 b: refs/heads/master c:
 4dcaa6b6df354fa44b3072bed3cb13aad7e5fbd4 h: refs/heads/master i:   261885:
 430fc22cde5cccad4d9011b0ae4344ba5d885345   261883:
 d64daae8ecbbf43f237250305b4e2477a0b452e9   261879:
 2b28fb9bb6cbbd7893b3f98d46c0aceb2188de60   261871:
 f3c879ba38ceb03aa31de79e9492e7ab48fdef29   261855:
 309c8c5331eba8c9fc8b0e239f4a5966739af63a   261823:
 014f9e01c26d1f34c5aeac3ba2c63f157b3365cb   261759:
 5405947d6582ba0bc256045e94cff4165eae4046   261631:
 c895bafff9335b1ef175ec73b0a8a6d9dde66c19 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/stmpe.c       | 2 +-
 trunk/drivers/mfd/stmpe.h       | 1 +
 trunk/include/linux/mfd/stmpe.h | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d07d68a35532..91fcffdd4d96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63c8a58d226a0701272b54015a8d73643d72cd3d
+refs/heads/master: 4dcaa6b6df354fa44b3072bed3cb13aad7e5fbd4
diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c
index 7ab7746631d4..2963689cf45c 100644
--- a/trunk/drivers/mfd/stmpe.c
+++ b/trunk/drivers/mfd/stmpe.c
@@ -228,7 +228,7 @@ int stmpe_block_write(struct stmpe *stmpe, u8 reg, u8 length,
 EXPORT_SYMBOL_GPL(stmpe_block_write);
 
 /**
- * stmpe_set_altfunc: set the alternate function for STMPE pins
+ * stmpe_set_altfunc()- set the alternate function for STMPE pins
  * @stmpe:	Device to configure
  * @pins:	Bitmask of pins to affect
  * @block:	block to enable alternate functions for
diff --git a/trunk/drivers/mfd/stmpe.h b/trunk/drivers/mfd/stmpe.h
index 0dbdc4e8cd77..e4ee38956583 100644
--- a/trunk/drivers/mfd/stmpe.h
+++ b/trunk/drivers/mfd/stmpe.h
@@ -42,6 +42,7 @@ struct stmpe_variant_block {
  * @id_mask:	bits valid in CHIPID register for comparison with id_val
  * @num_gpios:	number of GPIOS
  * @af_bits:	number of bits used to specify the alternate function
+ * @regs: variant specific registers.
  * @blocks:	list of blocks present on this device
  * @num_blocks:	number of blocks present on this device
  * @num_irqs:	number of internal IRQs available on this device
diff --git a/trunk/include/linux/mfd/stmpe.h b/trunk/include/linux/mfd/stmpe.h
index e762c270d8d4..be1af7c42e57 100644
--- a/trunk/include/linux/mfd/stmpe.h
+++ b/trunk/include/linux/mfd/stmpe.h
@@ -57,6 +57,7 @@ struct stmpe_variant_info;
  * @irq_lock: IRQ bus lock
  * @dev: device, mostly for dev_dbg()
  * @i2c: i2c client
+ * @partnum: part number
  * @variant: the detected STMPE model number
  * @regs: list of addresses of registers which are at different addresses on
  *	  different variants.  Indexed by one of STMPE_IDX_*.
@@ -121,6 +122,8 @@ struct stmpe_keypad_platform_data {
  * @norequest_mask: bitmask specifying which GPIOs should _not_ be
  *		    requestable due to different usage (e.g. touch, keypad)
  *		    STMPE_GPIO_NOREQ_* macros can be used here.
+ * @setup: board specific setup callback.
+ * @remove: board specific remove callback
  */
 struct stmpe_gpio_platform_data {
 	int gpio_base;