diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-06-27 14:36:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 15:11:43 -0700 |
| commit | 8c8709334cec803368a432a33e0f2e116d48fe07 (patch) | |
| tree | f3298ae6d844e548c36df9fc3bfb5a3662d4e45d /sound/ppc/pmac.h | |
| parent | fcd16cc084f2b98ab64d27721abdb941f3d9c4cb (diff) | |
| download | kernel-crypto-8c8709334cec803368a432a33e0f2e116d48fe07.tar.gz kernel-crypto-8c8709334cec803368a432a33e0f2e116d48fe07.tar.xz kernel-crypto-8c8709334cec803368a432a33e0f2e116d48fe07.zip | |
[PATCH] ppc32: Remove CONFIG_PMAC_PBOOK
This patch removes CONFIG_PMAC_PBOOK (PowerBook support). This is now
split into CONFIG_PMAC_MEDIABAY for the actual hotswap bay that some
powerbooks have, CONFIG_PM for power management related code, and just left
out of any CONFIG_* option for some generally useful stuff that can be used
on non-laptops as well.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/ppc/pmac.h')
| -rw-r--r-- | sound/ppc/pmac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h index 0a84c05f714..582db522011 100644 --- a/sound/ppc/pmac.h +++ b/sound/ppc/pmac.h @@ -167,7 +167,7 @@ struct snd_pmac { void (*set_format)(pmac_t *chip); void (*update_automute)(pmac_t *chip, int do_notify); int (*detect_headphone)(pmac_t *chip); -#ifdef CONFIG_PMAC_PBOOK +#ifdef CONFIG_PM void (*suspend)(pmac_t *chip); void (*resume)(pmac_t *chip); #endif |