[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>
このコミットが含まれているのは:
@@ -218,7 +218,7 @@ static snd_kcontrol_new_t daca_mixers[] = {
|
||||
};
|
||||
|
||||
|
||||
#ifdef CONFIG_PMAC_PBOOK
|
||||
#ifdef CONFIG_PM
|
||||
static void daca_resume(pmac_t *chip)
|
||||
{
|
||||
pmac_daca_t *mix = chip->mixer_data;
|
||||
@@ -227,7 +227,7 @@ static void daca_resume(pmac_t *chip)
|
||||
mix->amp_on ? 0x05 : 0x04);
|
||||
daca_set_volume(mix);
|
||||
}
|
||||
#endif /* CONFIG_PMAC_PBOOK */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
|
||||
static void daca_cleanup(pmac_t *chip)
|
||||
@@ -275,7 +275,7 @@ int __init snd_pmac_daca_init(pmac_t *chip)
|
||||
return err;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PMAC_PBOOK
|
||||
#ifdef CONFIG_PM
|
||||
chip->resume = daca_resume;
|
||||
#endif
|
||||
|
||||
|
新しいイシューから参照
ユーザーをブロックする