Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 762322ce24a9712345d5905d67e0ccec764d1c68..0cb8899a5cc109414baacd1f8a248c1920770408 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -75,7 +75,7 @@ config KATMAI
        select PCI
        select PPC4xx_PCI_EXPRESS
        select PCI_MSI
-       select PCC4xx_MSI
+       select PPC4xx_MSI
        help
          This option enables support for the AMCC PPC440SPe evaluation board.
 
@@ -197,22 +197,6 @@ config ICON
        help
          This option enables support for the AMCC PPC440SPe evaluation board.
 
-#config LUAN
-#      bool "Luan"
-#      depends on 44x
-#      default n
-#      select 440SP
-#      help
-#        This option enables support for the IBM PPC440SP evaluation board.
-
-#config OCOTEA
-#      bool "Ocotea"
-#      depends on 44x
-#      default n
-#      select 440GX
-#      help
-#        This option enables support for the IBM PPC440GX evaluation board.
-
 config XILINX_VIRTEX440_GENERIC_BOARD
        bool "Generic Xilinx Virtex 5 FXT board support"
        depends on 44x