Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 7486bff..eeba0a7 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -1,3 +1,12 @@
+config PPC_47x
+       bool "Support for 47x variant"
+       depends on 44x
+       default n
+       select MPIC
+       help
+         This option enables support for the 47x family of processors and is
+         not currently compatible with other 44x or 46x varients
+
 config BAMBOO
        bool "Bamboo"
        depends on 44x
@@ -151,6 +160,17 @@ config YOSEMITE
        help
          This option enables support for the AMCC PPC440EP evaluation board.
 
+config ISS4xx
+       bool "ISS 4xx Simulator"
+       depends on (44x || 40x)
+       default n
+       select 405GP if 40x
+       select 440GP if 44x && !PPC_47x
+       select PPC_FPU
+       select OF_RTC
+       help
+         This option enables support for the IBM ISS simulation environment
+
 #config LUAN
 #      bool "Luan"
 #      depends on 44x