diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:15:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:15:27 -0500 |
| commit | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (patch) | |
| tree | f0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7 | |
| parent | eb59c505f8a5906ad2e053d14fab50eb8574fd6f (diff) | |
| parent | 282e5aaba2a0cdfde4d2c2e34bc7438cd6f7a00f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
x86: Kconfig: drop unknown symbol 'APM_MODULE'
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5731eb70e0a0..1d2a69dd36d8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1742,7 +1742,7 @@ source "drivers/sfi/Kconfig" | |||
| 1742 | 1742 | ||
| 1743 | config X86_APM_BOOT | 1743 | config X86_APM_BOOT |
| 1744 | def_bool y | 1744 | def_bool y |
| 1745 | depends on APM || APM_MODULE | 1745 | depends on APM |
| 1746 | 1746 | ||
| 1747 | menuconfig APM | 1747 | menuconfig APM |
| 1748 | tristate "APM (Advanced Power Management) BIOS support" | 1748 | tristate "APM (Advanced Power Management) BIOS support" |