diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 21:24:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 21:24:58 -0500 |
commit | 13d7d84e078f49f08b657a3fba0d7a0b7b44ba65 (patch) | |
tree | ae4957d183e2f5fcae62b2c1411b4a32c2f71f21 /arch/powerpc/Kconfig | |
parent | cbb8fc07974073543fdc61da23713ab49ddd3ced (diff) | |
parent | 73c9ceab40b1269d6195e556773167c078ac8311 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (36 commits)
[POWERPC] Generic BUG for powerpc
[PPC] Fix compile failure do to introduction of PHY_POLL
[POWERPC] Only export __mtdcr/__mfdcr if CONFIG_PPC_DCR is set
[POWERPC] Remove old dcr.S
[POWERPC] Fix SPU coredump code for max_fdset removal
[POWERPC] Fix irq routing on some 32-bit PowerMacs
[POWERPC] ps3: Add vuart support
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
[POWERPC] dont allow pSeries_probe to succeed without initialising MMU
[POWERPC] micro optimise pSeries_probe
[POWERPC] Add SPURR SPR to sysfs
[POWERPC] Add DSCR SPR to sysfs
[POWERPC] Fix 440SPe CPU table entry
[POWERPC] Add support for FP emulation for the e300c2 core
[POWERPC] of_device_register: propagate device_create_file return code
[POWERPC] Fix mmap of PCI resource with hack for X
[POWERPC] iSeries: head_64.o needs to depend on lparmap.s
[POWERPC] cbe_thermal: Fix initialization of sysfs attribute_group
[POWERPC] Remove QE header files from lite5200.c
[POWERPC] of_platform_make_bus_id(): make `magic' int
...
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 56c3c4065eb0..8699dadcd096 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -107,6 +107,11 @@ config AUDIT_ARCH | |||
107 | bool | 107 | bool |
108 | default y | 108 | default y |
109 | 109 | ||
110 | config GENERIC_BUG | ||
111 | bool | ||
112 | default y | ||
113 | depends on BUG | ||
114 | |||
110 | config DEFAULT_UIMAGE | 115 | config DEFAULT_UIMAGE |
111 | bool | 116 | bool |
112 | help | 117 | help |
@@ -478,6 +483,7 @@ config PPC_MAPLE | |||
478 | select PPC_UDBG_16550 | 483 | select PPC_UDBG_16550 |
479 | select PPC_970_NAP | 484 | select PPC_970_NAP |
480 | select PPC_NATIVE | 485 | select PPC_NATIVE |
486 | select PPC_RTAS | ||
481 | default n | 487 | default n |
482 | help | 488 | help |
483 | This option enables support for the Maple 970FX Evaluation Board. | 489 | This option enables support for the Maple 970FX Evaluation Board. |
@@ -714,7 +720,7 @@ config FORCE_MAX_ZONEORDER | |||
714 | 720 | ||
715 | config MATH_EMULATION | 721 | config MATH_EMULATION |
716 | bool "Math emulation" | 722 | bool "Math emulation" |
717 | depends on 4xx || 8xx || E200 || E500 | 723 | depends on 4xx || 8xx || E200 || PPC_83xx || E500 |
718 | ---help--- | 724 | ---help--- |
719 | Some PowerPC chips designed for embedded applications do not have | 725 | Some PowerPC chips designed for embedded applications do not have |
720 | a floating-point unit and therefore do not implement the | 726 | a floating-point unit and therefore do not implement the |