[Xen-devel] Re: [PATCH] linux: adjust Solarflare Kconfig additions

[Kieran Mansley <kmansley@xxxxxxxxxxxxxx>]

On Thu, 2008-02-21 at 09:01 +0000, Jan Beulich wrote:
> Cleanup 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

Here's a respin to apply to the staging tree that won't conflict with
the earlier change to depend on X86.

Signed-off-by Kieran Mansley <kmansley@xxxxxxxxxxxxxx>

diff -r e65b5bb502d3 drivers/xen/Kconfig
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -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"

kconfig_rework
Description: Text Data

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