Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / drivers / mfd / ab3100-core.c

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 613481028272f114c754a4a652987fce90452cae..fd42a80e7bf95df87cfa6d88301b418fae596a96 100644 (file)
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -900,9 +900,6 @@ static int __init ab3100_probe(struct i2c_client *client,
                goto exit_no_testreg_client;
        }
 
-       strlcpy(ab3100->testreg_client->name, id->name,
-               sizeof(ab3100->testreg_client->name));
-
        err = ab3100_setup(ab3100);
        if (err)
                goto exit_no_setup;