diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2011-07-08 15:39:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 21:14:44 -0700 |
commit | 30cb35be6daff48ad6c049466ac92a22c200d1b2 (patch) | |
tree | a0cebf341f3e88afef9ce9a5582d5d327a9fd5ab | |
parent | 8f3b1327aa454bc8283e96bca7669c3c88b83f79 (diff) | |
download | linux-3.10-30cb35be6daff48ad6c049466ac92a22c200d1b2.tar.gz linux-3.10-30cb35be6daff48ad6c049466ac92a22c200d1b2.tar.bz2 linux-3.10-30cb35be6daff48ad6c049466ac92a22c200d1b2.zip |
drivers/leds/leds-pca9532.c: change driver name to be unique
This driver handles the variants pca9530-pca9533, so it chose the name
"pca953x". However, there is a gpio driver which decided on the same
name. As a result, those two can't be loaded at the same time. Add a
subsystem prefix to make the driver name unique. Device matching will not
suffer, because both are I2C drivers which match using a
i2c_device_id-table which is not altered.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/leds/leds-pca9532.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c index d8d3a1e910a..a2c874623e3 100644 --- a/drivers/leds/leds-pca9532.c +++ b/drivers/leds/leds-pca9532.c @@ -88,7 +88,7 @@ static const struct pca9532_chip_info pca9532_chip_info_tbl[] = { static struct i2c_driver pca9532_driver = { .driver = { - .name = "pca953x", + .name = "leds-pca953x", }, .probe = pca9532_probe, .remove = pca9532_remove, |