| Message ID | 1312566596-10373-1-git-send-email-john.johansen@canonical.com |
|---|---|
| State | New |
| Headers | show |
Applied to Oneiric. Thanks, Leann On Fri, 2011-08-05 at 10:49 -0700, John Johansen wrote: > Signed-off-by: John Johansen <john.johansen@canonical.com> > --- > debian.master/config/config.common.ubuntu | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 0d52723..88971a7 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -2308,16 +2308,17 @@ CONFIG_IPMI_SI=m > CONFIG_IPMI_WATCHDOG=m > CONFIG_IPPP_FILTER=y > CONFIG_IPV6=y > -# CONFIG_IPV6_MIP6 is not set > +CONFIG_IPV6_MIP6=m > # CONFIG_IPV6_MROUTE is not set > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_NDISC_NODETYPE=y > # CONFIG_IPV6_OPTIMISTIC_DAD is not set > CONFIG_IPV6_PRIVACY=y > -# CONFIG_IPV6_ROUTER_PREF is not set > +CONFIG_IPV6_ROUTER_PREF=y > +CONFIG_IPV6_ROUTE_INFO=y > CONFIG_IPV6_SIT=m > CONFIG_IPV6_SIT_6RD=y > -# CONFIG_IPV6_SUBTREES is not set > +CONFIG_IPV6_SUBTREES=y > CONFIG_IPV6_TUNNEL=m > CONFIG_IPW2100=m > # CONFIG_IPW2100_DEBUG is not set > -- > 1.7.5.4 > >
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 0d52723..88971a7 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2308,16 +2308,17 @@ CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPPP_FILTER=y CONFIG_IPV6=y -# CONFIG_IPV6_MIP6 is not set +CONFIG_IPV6_MIP6=m # CONFIG_IPV6_MROUTE is not set CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_OPTIMISTIC_DAD is not set CONFIG_IPV6_PRIVACY=y -# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y -# CONFIG_IPV6_SUBTREES is not set +CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_TUNNEL=m CONFIG_IPW2100=m # CONFIG_IPW2100_DEBUG is not set
Signed-off-by: John Johansen <john.johansen@canonical.com> --- debian.master/config/config.common.ubuntu | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)