From bc2015b912dfdbd7b8c268f7e3ea06597fbc9008 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 23 May 2007 09:51:46 -0500 Subject: [PATCH] --- yaml --- r: 57045 b: refs/heads/master c: 58da10bb3fe680a197e83d5eccb5265a721c98e2 h: refs/heads/master i: 57043: 246a90080bbbf86eb607e054ed4032260eee129c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 1 + trunk/drivers/macintosh/Kconfig | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 262e51960456..aeb48514adc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1c9889a3860028b3578b98c3a56bdf0dd658920 +refs/heads/master: 58da10bb3fe680a197e83d5eccb5265a721c98e2 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 56d3c0dcd2b8..5eaeafd30bdf 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -118,6 +118,7 @@ config GENERIC_BUG depends on BUG config SYS_SUPPORTS_APM_EMULATION + default y if PMAC_APM_EMU bool config DEFAULT_UIMAGE diff --git a/trunk/drivers/macintosh/Kconfig b/trunk/drivers/macintosh/Kconfig index 58926da0ae18..f44c94abd883 100644 --- a/trunk/drivers/macintosh/Kconfig +++ b/trunk/drivers/macintosh/Kconfig @@ -113,7 +113,6 @@ config PMAC_SMU config PMAC_APM_EMU tristate "APM emulation" - select SYS_SUPPORTS_APM_EMULATION select APM_EMULATION depends on ADB_PMU && PM