[POWERPC] Miscellaneous arch/powerpc Kconfig and platform/Kconfig cleanup

* Cleaned up some whitespace in arch/powerpc/Kconfig
* Moved sourcing of platforms/embedded6xx/Kconfig into platform/Kconfig
* Moved sourcing of platforms/4xx/Kconfig into platform/Kconfig and disabled it
* Removed EMBEDDEDBOOT since its not supported in arch/powerpc
* Removed PC_KEYBOARD since its not used anywhere
* Moved a few CONFIG options around in platform/Kconfig
* Moved interrupt controllers into platform/Kconfig out of bus section

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

1 files changed, 5 insertions, 32 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 033666cf0f77..26713da1b524 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -192,7 +192,6 @@ config 44x
         bool "AMCC 44x"
         select PPC_DCR_NATIVE
 
-
 config E200
         bool "Freescale e200"
 
@@ -375,9 +374,6 @@ source "init/Kconfig"
 
 source "arch/powerpc/platforms/Kconfig"
 
-source arch/powerpc/platforms/embedded6xx/Kconfig
-source arch/powerpc/platforms/4xx/Kconfig
-
 menu "Kernel options"
 
 config HIGHMEM
@@ -459,15 +455,6 @@ config CRASH_DUMP
 
           Don't change this unless you know what you are doing.
 
-config EMBEDDEDBOOT
-        bool
-        depends on 8xx || 8260
-        default y
-
-config PC_KEYBOARD
-        bool "PC PS/2 style Keyboard"
-        depends on 4xx || CPM2
-
 config PPCBUG_NVRAM
         bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
         default y if PPC_PREP
@@ -481,7 +468,6 @@ config IRQ_ALL_CPUS
           CPU.  Generally saying Y is safe, although some problems have been
           reported with SMP Power Macintoshes with this option enabled.
 
-
 config NUMA
         bool "NUMA support"
         depends on PPC64
@@ -531,10 +517,10 @@ config PPC_64K_PAGES
         depends on PPC64
         help
           This option changes the kernel logical page size to 64k. On machines
-          without processor support for 64k pages, the kernel will simulate
-          them by loading each individual 4k page on demand transparently,
-          while on hardware with such support, it will be used to map
-          normal application pages.
+          without processor support for 64k pages, the kernel will simulate
+          them by loading each individual 4k page on demand transparently,
+          while on hardware with such support, it will be used to map
+          normal application pages.
 
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
@@ -614,18 +600,6 @@ config GENERIC_ISA_DMA
         depends on PPC64 || POWER4 || 6xx && !CPM2
         default y
 
-config MPIC
-        bool
-        default n
-
-config MPIC_WEIRD
-        bool
-        default n
-
-config PPC_I8259
-        bool
-        default n
-
 config PPC_INDIRECT_PCI
         bool
         depends on PCI
@@ -857,11 +831,10 @@ source "fs/Kconfig"
 
 source "arch/powerpc/sysdev/qe_lib/Kconfig"
 
-
 source "lib/Kconfig"
 
 menu "Instrumentation Support"
-        depends on EXPERIMENTAL
+        depends on EXPERIMENTAL
 
 source "arch/powerpc/oprofile/Kconfig"