Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[pandora-kernel.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 85195e4..b177caa 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -379,10 +379,6 @@ config PHYP_DUMP
 
          If unsure, say "N"
 
-config PPCBUG_NVRAM
-       bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
-       default y if PPC_PREP
-
 config IRQ_ALL_CPUS
        bool "Distribute interrupts on all CPUs by default"
        depends on SMP && !MV64360
@@ -745,24 +741,6 @@ config 8260_PCI9
        depends on PCI_8260 && !8272
        default y
 
-choice
-       prompt "IDMA channel for PCI 9 workaround"
-       depends on 8260_PCI9
-
-config 8260_PCI9_IDMA1
-       bool "IDMA1"
-
-config 8260_PCI9_IDMA2
-       bool "IDMA2"
-
-config 8260_PCI9_IDMA3
-       bool "IDMA3"
-
-config 8260_PCI9_IDMA4
-       bool "IDMA4"
-
-endchoice
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"