diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /drivers/macintosh/via-pmu-led.c | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/macintosh/via-pmu-led.c')
| -rw-r--r-- | drivers/macintosh/via-pmu-led.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c index af8375ed0f5e..5189d5454b1f 100644 --- a/drivers/macintosh/via-pmu-led.c +++ b/drivers/macintosh/via-pmu-led.c | |||
| @@ -74,7 +74,7 @@ static void pmu_led_set(struct led_classdev *led_cdev, | |||
| 74 | 74 | ||
| 75 | static struct led_classdev pmu_led = { | 75 | static struct led_classdev pmu_led = { |
| 76 | .name = "pmu-front-led", | 76 | .name = "pmu-front-led", |
| 77 | #ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK | 77 | #ifdef CONFIG_ADB_PMU_LED_IDE |
| 78 | .default_trigger = "ide-disk", | 78 | .default_trigger = "ide-disk", |
| 79 | #endif | 79 | #endif |
| 80 | .brightness_set = pmu_led_set, | 80 | .brightness_set = pmu_led_set, |