Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4a89f7fa7a32e35d3b5d956846cd2ae274db5ed2
Commit: 4a89f7fa7a32e35d3b5d956846cd2ae274db5ed2
Parent: 164a460d467a43e9f403cd4b76cec626dff99779
Author: Kumar Gala <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 12 15:41:26 2007 -0500
Committer: Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Thu Apr 12 15:41:26 2007 -0500
[POWERPC] Convert 86xx platform to unified platform Kconfig
Moved 86xx platform Kconfig over to being sourced by the unified
arch/powerpc/platforms/Kconfig.
Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
---
arch/powerpc/Kconfig | 6 +++++-
arch/powerpc/platforms/86xx/Kconfig | 18 +++---------------
arch/powerpc/platforms/Kconfig | 3 ++-
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 740892a..d37e0b8 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -380,7 +380,6 @@ source arch/powerpc/platforms/4xx/Kconfig
source arch/powerpc/platforms/82xx/Kconfig
source arch/powerpc/platforms/83xx/Kconfig
source arch/powerpc/platforms/85xx/Kconfig
-source arch/powerpc/platforms/86xx/Kconfig
source arch/powerpc/platforms/8xx/Kconfig
menu "Kernel options"
@@ -637,6 +636,11 @@ config PPC_INDIRECT_PCI
default y if 40x || 44x
default n
+config PPC_INDIRECT_PCI_BE
+ bool
+ depends PPC_INDIRECT_PCI
+ default n
+
config EISA
bool
diff --git a/arch/powerpc/platforms/86xx/Kconfig
b/arch/powerpc/platforms/86xx/Kconfig
index 0c70944..d1bcff5 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,8 +1,6 @@
-menu "Platform Support"
- depends on PPC_86xx
-
choice
prompt "Machine Type"
+ depends on PPC_86xx
default MPC8641_HPCN
config MPC8641_HPCN
@@ -14,20 +12,10 @@ config MPC8641_HPCN
endchoice
-
config MPC8641
bool
select PPC_INDIRECT_PCI
+ select PPC_INDIRECT_PCI_BE
select PPC_UDBG_16550
+ select MPIC
default y if MPC8641_HPCN
-
-config MPIC
- bool
- default y
-
-config PPC_INDIRECT_PCI_BE
- bool
- depends on PPC_86xx
- default y
-
-endmenu
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 176a27f..5f2cef0 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,5 +1,5 @@
menu "Platform support"
- depends on PPC64 || CLASSIC32
+ depends on PPC64 || CLASSIC32 || PPC_86xx
choice
prompt "Machine type"
@@ -45,6 +45,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig"
source arch/powerpc/platforms/celleb/Kconfig
source arch/powerpc/platforms/ps3/Kconfig
source arch/powerpc/platforms/cell/Kconfig
+source "arch/powerpc/platforms/86xx/Kconfig"
config PPC_NATIVE
bool
-
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
