diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-08-23 17:46:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 21:43:43 -0400 |
| commit | 6299afc40c8612a87358ecea80882395fe67111f (patch) | |
| tree | 8940b518f5bc72bd05722873829884e1ab8f9dc8 /arch/ppc/platforms | |
| parent | f08243a491f3e21feabbb04476a03fb0cbc975ff (diff) | |
[PATCH] Kconfig fix (CONFIG_PM on 44x)
CONFIG_PM is broken on 44x; removed duplicate entry for CONFIG_PM, made
the inclusion of generic one conditional on BROKEN || !44x.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/platforms')
| -rw-r--r-- | arch/ppc/platforms/4xx/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig index 853ee908c6eb..805dd98908a3 100644 --- a/arch/ppc/platforms/4xx/Kconfig +++ b/arch/ppc/platforms/4xx/Kconfig | |||
| @@ -240,10 +240,6 @@ config PPC_GEN550 | |||
| 240 | depends on 4xx | 240 | depends on 4xx |
| 241 | default y | 241 | default y |
| 242 | 242 | ||
| 243 | config PM | ||
| 244 | bool "Power Management support (EXPERIMENTAL)" | ||
| 245 | depends on 4xx && EXPERIMENTAL | ||
| 246 | |||
| 247 | choice | 243 | choice |
| 248 | prompt "TTYS0 device and default console" | 244 | prompt "TTYS0 device and default console" |
| 249 | depends on 40x | 245 | depends on 40x |