Merge branch 'next' into for-linus

Prepare first set of updates for 3.8 merge window.

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index c94f521f392..bf1ba93f43a 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -324,6 +324,7 @@ static struct resource stmpe_keypad_resources[] = {
 
 static struct mfd_cell stmpe_keypad_cell = {
         .name           = "stmpe-keypad",
+        .of_compatible  = "st,stmpe-keypad",
         .resources      = stmpe_keypad_resources,
         .num_resources  = ARRAY_SIZE(stmpe_keypad_resources),
 };
@@ -411,6 +412,7 @@ static struct resource stmpe_ts_resources[] = {
 
 static struct mfd_cell stmpe_ts_cell = {
         .name           = "stmpe-ts",
+        .of_compatible  = "st,stmpe-ts",
         .resources      = stmpe_ts_resources,
         .num_resources  = ARRAY_SIZE(stmpe_ts_resources),
 };