[XenPPC] [linux-ppc-2.6] [ppc] make our Kconfig logic more merge friendly.

[Xen patchbot-linux-ppc-2.6 <patchbot-linux-ppc-2.6@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 3fa1002443e85dba241121cb32bfca14cf6d736a
# Parent  5c0c59eb5f73e7862590a8adca52bc74171bf2d5
[ppc] make our Kconfig logic more merge friendly.

Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
---
 arch/powerpc/Kconfig      |    5 +----
 drivers/xen/Kconfig       |    3 +++
 drivers/xen/core/Makefile |    1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff -r 5c0c59eb5f73 -r 3fa1002443e8 arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig      Thu Jun 08 15:10:05 2006 -0400
+++ b/arch/powerpc/Kconfig      Fri Jun 09 09:45:30 2006 -0400
@@ -399,14 +399,11 @@ config PPC_CELL
 
 config PPC_XEN
        bool "Enable Xen compatible kernel"
-       depends PPC_MULTIPLATFORM && PPC64 && PPC_MAPLE && PPC_PSERIES && SMP
+       depends on PPC_MULTIPLATFORM && PPC64 && PPC_MAPLE && PPC_PSERIES && SMP
        select XEN
        select XEN_PRIVILEGED_GUEST
        select XEN_UNPRIVILEGED_GUEST
        select XEN_XENCOMM
-       reverse XEN_BALLOON
-       reverse XEN_REBOOT
-       reverse XEN_SMPBOOT
        
        help
          This option will compile a kernel compatible with Xen hypervisor
diff -r 5c0c59eb5f73 -r 3fa1002443e8 drivers/xen/Kconfig
--- a/drivers/xen/Kconfig       Thu Jun 08 15:10:05 2006 -0400
+++ b/drivers/xen/Kconfig       Fri Jun 09 09:45:30 2006 -0400
@@ -234,6 +234,7 @@ config XEN_UTIL
 
 config XEN_BALLOON
        bool
+       depends on !PPC_XEN
        default y
 
 config XEN_DEVMEM
@@ -247,10 +248,12 @@ config XEN_SKBUFF
 
 config XEN_REBOOT
        bool
+       depends on !PPC_XEN
        default y
 
 config XEN_SMPBOOT
        bool
+       depends on !PPC_XEN
        default y
        depends on SMP
 
diff -r 5c0c59eb5f73 -r 3fa1002443e8 drivers/xen/core/Makefile
--- a/drivers/xen/core/Makefile Thu Jun 08 15:10:05 2006 -0400
+++ b/drivers/xen/core/Makefile Fri Jun 09 09:45:30 2006 -0400
@@ -15,3 +15,4 @@ obj-$(CONFIG_XEN_SKBUFF)      += skbuff.o
 obj-$(CONFIG_XEN_SKBUFF)       += skbuff.o
 obj-$(CONFIG_XEN_REBOOT)       += reboot.o
 obj-$(CONFIG_XEN_SMPBOOT)      += smpboot.o
+obj-$(CONFIG_XEN_XENCOMM)      += xencomm.o

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel