diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-01 12:44:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-08-03 23:18:17 -0400 |
| commit | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 (patch) | |
| tree | f916fd843972502d918a1a03bdb99c9c2bbaa91c /arch/powerpc/Kconfig.debug | |
| parent | c7c8eede2739289df02a1ab297cc476c6f38dca7 (diff) | |
powerpc: Remove use of CONFIG_PPC_MERGE
Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove
the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc
and include/asm-powerpc.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/Kconfig.debug')
| -rw-r--r-- | arch/powerpc/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 8c8aadbe9563..4ebc52a19f0a 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
| @@ -97,7 +97,7 @@ config IRQSTACKS | |||
| 97 | 97 | ||
| 98 | config VIRQ_DEBUG | 98 | config VIRQ_DEBUG |
| 99 | bool "Expose hardware/virtual IRQ mapping via debugfs" | 99 | bool "Expose hardware/virtual IRQ mapping via debugfs" |
| 100 | depends on DEBUG_FS && PPC_MERGE | 100 | depends on DEBUG_FS |
| 101 | help | 101 | help |
| 102 | This option will show the mapping relationship between hardware irq | 102 | This option will show the mapping relationship between hardware irq |
| 103 | numbers and virtual irq numbers. The mapping is exposed via debugfs | 103 | numbers and virtual irq numbers. The mapping is exposed via debugfs |