Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / mfd / twl4030-irq.c

diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 202bdd59632d4e90355ea4bf8c733e1ee3719d18..097f24d8bceb9ec2ad0d1440430c302d7f0a4a35 100644 (file)
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -232,10 +232,11 @@ static const struct sih sih_modules_twl5031[8] = {
        },
        [6] = {
                /*
-                * ACI doesn't use the same SIH organization.
-                * For example, it supports only one interrupt line
+                * ECI/DBI doesn't use the same SIH organization.
+                * For example, it supports only one interrupt output line.
+                * That is, the interrupts are seen on both INT1 and INT2 lines.
                 */
-               .name           = "aci",
+               .name           = "eci_dbi",
                .module         = TWL5031_MODULE_ACCESSORY,
                .bits           = 9,
                .bytes_ixr      = 2,
@@ -247,8 +248,8 @@ static const struct sih sih_modules_twl5031[8] = {
 
        },
        [7] = {
-               /* Accessory */
-               .name           = "acc",
+               /* Audio accessory */
+               .name           = "audio",
                .module         = TWL5031_MODULE_ACCESSORY,
                .control_offset = TWL5031_ACCSIHCTRL,
                .bits           = 2,