diff options
author | Olof Johansson <olof@lixom.net> | 2006-10-05 21:31:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 21:39:04 -0400 |
commit | 49f19ce401edfff937c448dd74c22497da361889 (patch) | |
tree | 3c657340fd3a34fcff516bbf09c4d72f5e141c7b /sound/oss/dmasound | |
parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) |
[PATCH] powerpc: irq change build breaks
Fix up some of the buildbreaks from the irq handler changes.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/dmasound')
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 3bd19c36fcd9..37773b1deea5 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -465,7 +465,7 @@ tas_dmasound_init(void) | |||
465 | val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0); | 465 | val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0); |
466 | pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80); | 466 | pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80); |
467 | /* Trigger it */ | 467 | /* Trigger it */ |
468 | headphone_intr(0,NULL,NULL); | 468 | headphone_intr(0, NULL); |
469 | } | 469 | } |
470 | } | 470 | } |
471 | if (!gpio_headphone_irq) { | 471 | if (!gpio_headphone_irq) { |
@@ -1499,7 +1499,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when) | |||
1499 | write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol); | 1499 | write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol); |
1500 | msleep(150); | 1500 | msleep(150); |
1501 | tas_leave_sleep(); /* Stub for now */ | 1501 | tas_leave_sleep(); /* Stub for now */ |
1502 | headphone_intr(0,NULL,NULL); | 1502 | headphone_intr(0, NULL); |
1503 | break; | 1503 | break; |
1504 | case AWACS_DACA: | 1504 | case AWACS_DACA: |
1505 | msleep(10); /* Check this !!! */ | 1505 | msleep(10); /* Check this !!! */ |