mfd: twl4030-power: Rename DEVGROUP to DEV_GRP

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mfd / twl4030-core.c

diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 98b984e191d5281c60377c4cc8321e898542fcae..e3abbf66cc5cfa64691c73a50bdb62a5c29f9e38 100644 (file)
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -39,7 +39,7 @@
 #include <linux/i2c/twl4030.h>
 
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-#include <mach/cpu.h>
+#include <plat/cpu.h>
 #endif
 
 /*
@@ -814,8 +814,6 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
                                status = -ENOMEM;
                                goto fail;
                        }
-                       strlcpy(twl->client->name, id->name,
-                                       sizeof(twl->client->name));
                }
                mutex_init(&twl->xfer_lock);
        }