Pull sgi into release branch

[mv-sheeva.git] / include / net / ip6_fib.h

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index f9cde44f93b44be4e104812f056b813d59e603c6..7be4f4e3a0f2241b27ebb72aa69d0582a93a9fff 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -50,9 +50,9 @@ struct fib6_node
        struct fib6_node        *parent;
        struct fib6_node        *left;
        struct fib6_node        *right;
-
+#ifdef CONFIG_IPV6_SUBTREES
        struct fib6_node        *subtree;
-
+#endif
        struct rt6_info         *leaf;
 
        __u16                   fn_bit;         /* bit key */