diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-21 11:59:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 12:00:01 -0400 |
| commit | 994bf1c92270e3d7731ea08f1d1bd7a668314e60 (patch) | |
| tree | 4409a21eab486e53fbe350a66e8a4f28b7a720c0 /drivers/leds/leds-pca9532.c | |
| parent | bd96efe17d945f0bad56d592f8686dc6309905e7 (diff) | |
| parent | cf6ace16a3cd8b728fb0afa68368fd40bbeae19f (diff) | |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest scheduler fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/leds/leds-pca9532.c')
| -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 d8d3a1e910a1..a2c874623e35 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[] = { | |||
| 88 | 88 | ||
| 89 | static struct i2c_driver pca9532_driver = { | 89 | static struct i2c_driver pca9532_driver = { |
| 90 | .driver = { | 90 | .driver = { |
| 91 | .name = "pca953x", | 91 | .name = "leds-pca953x", |
| 92 | }, | 92 | }, |
| 93 | .probe = pca9532_probe, | 93 | .probe = pca9532_probe, |
| 94 | .remove = pca9532_remove, | 94 | .remove = pca9532_remove, |