Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[android-sdk/kernel-video.git] / drivers / mfd / stmpe-i2c.c

diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 36df187780294191469a486019f0a1178469d3f8..fd5fcb63068548d57c44ed3cd0d777228fdbcaec 100644 (file)
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -82,11 +82,13 @@ static const struct i2c_device_id stmpe_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, stmpe_id);
 
 static struct i2c_driver stmpe_i2c_driver = {
-       .driver.name    = "stmpe-i2c",
-       .driver.owner   = THIS_MODULE,
+       .driver = {
+               .name = "stmpe-i2c",
+               .owner = THIS_MODULE,
 #ifdef CONFIG_PM
-       .driver.pm      = &stmpe_dev_pm_ops,
+               .pm = &stmpe_dev_pm_ops,
 #endif
+       },
        .probe          = stmpe_i2c_probe,
        .remove         = stmpe_i2c_remove,
        .id_table       = stmpe_i2c_id,