aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2011-10-24 07:42:06 -0400
committerMichal Marek <mmarek@suse.cz>2011-10-31 18:39:52 -0400
commit6805ab6daa2b589fe3242d05ddc47a9dbb0c4eb1 (patch)
treea30f7ec4ec1202f3dcbf93745fdbb98d1be4a4c7
parent21a06da3986f998108ad24b1c9fa11599a9f24f6 (diff)
powerpc: drop unused Kconfig symbols
Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--arch/powerpc/Kconfig22
-rw-r--r--arch/powerpc/platforms/Kconfig.cputype8
-rw-r--r--arch/powerpc/platforms/embedded6xx/Kconfig4
-rw-r--r--arch/powerpc/platforms/prep/Kconfig9
-rw-r--r--arch/powerpc/platforms/wsp/Kconfig5
5 files changed, 0 insertions, 48 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6926b61acfea..6887d80fe6e5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -379,10 +379,6 @@ config PHYP_DUMP
379 379
380 If unsure, say "N" 380 If unsure, say "N"
381 381
382config PPCBUG_NVRAM
383 bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
384 default y if PPC_PREP
385
386config IRQ_ALL_CPUS 382config IRQ_ALL_CPUS
387 bool "Distribute interrupts on all CPUs by default" 383 bool "Distribute interrupts on all CPUs by default"
388 depends on SMP && !MV64360 384 depends on SMP && !MV64360
@@ -744,24 +740,6 @@ config 8260_PCI9
744 depends on PCI_8260 && !8272 740 depends on PCI_8260 && !8272
745 default y 741 default y
746 742
747choice
748 prompt "IDMA channel for PCI 9 workaround"
749 depends on 8260_PCI9
750
751config 8260_PCI9_IDMA1
752 bool "IDMA1"
753
754config 8260_PCI9_IDMA2
755 bool "IDMA2"
756
757config 8260_PCI9_IDMA3
758 bool "IDMA3"
759
760config 8260_PCI9_IDMA4
761 bool "IDMA4"
762
763endchoice
764
765source "drivers/pci/pcie/Kconfig" 743source "drivers/pci/pcie/Kconfig"
766 744
767source "drivers/pci/Kconfig" 745source "drivers/pci/Kconfig"
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index e06e39589a09..f16f997af981 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -282,14 +282,6 @@ config PPC_MMU_NOHASH
282 def_bool y 282 def_bool y
283 depends on !PPC_STD_MMU 283 depends on !PPC_STD_MMU
284 284
285config PPC_MMU_NOHASH_32
286 def_bool y
287 depends on PPC_MMU_NOHASH && PPC32
288
289config PPC_MMU_NOHASH_64
290 def_bool y
291 depends on PPC_MMU_NOHASH && PPC64
292
293config PPC_BOOK3E_MMU 285config PPC_BOOK3E_MMU
294 def_bool y 286 def_bool y
295 depends on FSL_BOOKE || PPC_BOOK3E 287 depends on FSL_BOOKE || PPC_BOOK3E
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 524d971a1478..5a8f50a9afa7 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -87,10 +87,6 @@ config MV64X60
87config MPC10X_OPENPIC 87config MPC10X_OPENPIC
88 bool 88 bool
89 89
90config MPC10X_STORE_GATHERING
91 bool "Enable MPC10x store gathering"
92 depends on MPC10X_BRIDGE
93
94config GAMECUBE_COMMON 90config GAMECUBE_COMMON
95 bool 91 bool
96 92
diff --git a/arch/powerpc/platforms/prep/Kconfig b/arch/powerpc/platforms/prep/Kconfig
index f0536c7cda9f..1547f66235d9 100644
--- a/arch/powerpc/platforms/prep/Kconfig
+++ b/arch/powerpc/platforms/prep/Kconfig
@@ -21,12 +21,3 @@ config PREP_RESIDUAL
21 or pass the 'noresidual' option to the kernel. 21 or pass the 'noresidual' option to the kernel.
22 22
23 If you are running a PReP system, say Y here, otherwise say N. 23 If you are running a PReP system, say Y here, otherwise say N.
24
25config PROC_PREPRESIDUAL
26 bool "Support for reading of PReP Residual Data in /proc"
27 depends on PREP_RESIDUAL && PROC_FS
28 help
29 Enabling this option will create a /proc/residual file which allows
30 you to get at the residual data on PReP systems. You will need a tool
31 (lsresidual) to parse it. If you aren't on a PReP system, you don't
32 want this.
diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig
index c3c48eb62cc1..375f01ed1bdd 100644
--- a/arch/powerpc/platforms/wsp/Kconfig
+++ b/arch/powerpc/platforms/wsp/Kconfig
@@ -21,8 +21,3 @@ endmenu
21config PPC_A2_DD2 21config PPC_A2_DD2
22 bool "Support for DD2 based A2/WSP systems" 22 bool "Support for DD2 based A2/WSP systems"
23 depends on PPC_A2 23 depends on PPC_A2
24
25config WORKAROUND_ERRATUM_463
26 depends on PPC_A2_DD2
27 bool "Workaround erratum 463"
28 default y