Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3cc248ae6eaac4175047d1fdc4fadd8a94651f83
Commit:     3cc248ae6eaac4175047d1fdc4fadd8a94651f83
Parent:     15f6527e8e63e793f8ab1ddce4ed3c487ebd0d42
Author:     Josh Boyer <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 20 07:27:42 2007 -0500
Committer:  Josh Boyer <[EMAIL PROTECTED]>
CommitDate: Mon Aug 20 07:27:42 2007 -0500

    [POWERPC] 4xx Kconfig cleanup
    
    Remove some leftover cruft in the 40x Kconfig file.  Also make sure we
    select WANT_DEVICE_TREE for 40x.
    
    Signed-off-by: Josh Boyer <[EMAIL PROTECTED]>
    Acked-by: David Gibson <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/40x/Kconfig     |   77 --------------------------------
 arch/powerpc/platforms/Kconfig.cputype |    1 +
 2 files changed, 1 insertions(+), 77 deletions(-)

diff --git a/arch/powerpc/platforms/40x/Kconfig 
b/arch/powerpc/platforms/40x/Kconfig
index ded357c..2cc7343 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -1,16 +1,3 @@
-config 4xx
-       bool
-       depends on 40x || 44x
-       default y
-
-config BOOKE
-       bool
-       depends on 44x
-       default y
-
-menu "AMCC 40x options"
-       depends on 40x
-
 #config BUBINGA
 #      bool "Bubinga"
 #      depends on 40x
@@ -82,8 +69,6 @@ menu "AMCC 40x options"
 #      help
 #        This option enables support for the Xilinx ML300 evaluation board.
 
-endmenu
-
 # 40x specific CPU modules, selected based on the board above.
 config NP405H
        bool
@@ -126,68 +111,6 @@ config IBM405_ERR77
 config IBM405_ERR51
        bool
 
-menu "AMCC 44x options"
-       depends on 44x
-
-#config BAMBOO
-#      bool "Bamboo"
-#      depends on 44x
-#      default n
-#      select 440EP
-#      help
-#        This option enables support for the IBM PPC440EP evaluation board.
-
-config EBONY
-       bool "Ebony"
-       depends on 44x
-       default y
-       select 440GP
-       help
-         This option enables support for the IBM PPC440GP 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.
-
-endmenu
-
-# 44x specific CPU modules, selected based on the board above.
-config 440EP
-       bool
-       select PPC_FPU
-       select IBM440EP_ERR42
-
-config 440GP
-       bool
-       select IBM_NEW_EMAC_ZMII
-
-config 440GX
-       bool
-
-config 440SP
-       bool
-
-config 440A
-       bool
-       depends on 440GX
-       default y
-
-# 44x errata/workaround config symbols, selected by the CPU models above
-config IBM440EP_ERR42
-       bool
-
 #config XILINX_OCP
 #      bool
 #      depends on XILINX_ML300
diff --git a/arch/powerpc/platforms/Kconfig.cputype 
b/arch/powerpc/platforms/Kconfig.cputype
index e4b2aee..643bee2 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -40,6 +40,7 @@ config PPC_8xx
 config 40x
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
+       select WANT_DEVICE_TREE
 
 config 44x
        bool "AMCC 44x"
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to