[Xen-changelog] [linux-2.6.18-xen] Solarflare: adjust Kconfig additions

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1203589294 0
# Node ID fc44fda2c68a9dc057e98dafdfe6eece417c106c
# Parent  3445e940a0e762a44a0bfd64940b15710cb03ef9
Solarflare: adjust Kconfig additions

Clean up drivers/xen/Kconfig after the Solarflare additions:
- placement of new items should not disturb menu hierarchy
- dependencies of XEN_NETDEV_ACCEL_SFC_BACKEND were missing
- use tabs for indentation

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Kieran Mansley <kmansley@xxxxxxxxxxxxxx>
---
 drivers/xen/Kconfig |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff -r 3445e940a0e7 -r fc44fda2c68a drivers/xen/Kconfig
--- a/drivers/xen/Kconfig       Thu Feb 21 10:20:43 2008 +0000
+++ b/drivers/xen/Kconfig       Thu Feb 21 10:21:34 2008 +0000
@@ -29,6 +29,10 @@ config XEN_XENBUS_DEV
 config XEN_XENBUS_DEV
        def_bool y
        depends on PROC_FS
+
+config XEN_NETDEV_ACCEL_SFC_UTIL
+       depends on X86    
+       tristate
 
 config XEN_BACKEND
         tristate "Backend driver support"
@@ -79,16 +83,11 @@ config XEN_NETDEV_PIPELINED_TRANSMITTER
          are unsure; or if you experience network hangs when this option is
          enabled; then you must say N here.
 
-config XEN_NETDEV_ACCEL_SFC_UTIL
-        tristate
-        depends on X86
-        default n
-
 config XEN_NETDEV_ACCEL_SFC_BACKEND
        tristate "Network-device backend driver acceleration for Solarflare 
NICs"
-        depends on XEN_NETDEV_BACKEND && SFC && SFC_RESOURCE && X86
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-        default m
+       depends on XEN_NETDEV_BACKEND && SFC && SFC_RESOURCE && X86
+       select XEN_NETDEV_ACCEL_SFC_UTIL
+       default m
 
 config XEN_NETDEV_LOOPBACK
        tristate "Network-device loopback driver"
@@ -186,18 +185,18 @@ config XEN_NETDEV_FRONTEND
          dedicated device-driver domain, or your master control domain
          (domain 0), then you almost certainly want to say Y here.
 
+config XEN_NETDEV_ACCEL_SFC_FRONTEND
+       tristate "Network-device frontend driver acceleration for Solarflare 
NICs"
+       depends on XEN_NETDEV_FRONTEND && X86
+       select XEN_NETDEV_ACCEL_SFC_UTIL
+       default m
+
 config XEN_GRANT_DEV
        tristate "User-space granted page access driver"
        default XEN_PRIVILEGED_GUEST
        help
          Device for accessing (in user-space) pages that have been granted
          by other domains.
-
-config XEN_NETDEV_ACCEL_SFC_FRONTEND
-       tristate "Network-device frontend driver acceleration for Solarflare 
NICs"
-       depends on XEN_NETDEV_FRONTEND && X86
-        select XEN_NETDEV_ACCEL_SFC_UTIL
-       default m
 
 config XEN_FRAMEBUFFER
        tristate "Framebuffer-device frontend driver"

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