diff --git a/[refs] b/[refs] index 473f008273d5..6f0538b7eefa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e336d0fc99f159ed636ffb9128bc84e09ccc279 +refs/heads/master: 5075138d67ac66adab777163907d92d1a955ff50 diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig index cdb8fdef6c4a..a12bae0e3fe9 100644 --- a/trunk/net/Kconfig +++ b/trunk/net/Kconfig @@ -185,6 +185,7 @@ source "net/x25/Kconfig" source "net/lapb/Kconfig" source "net/econet/Kconfig" source "net/wanrouter/Kconfig" +source "net/phonet/Kconfig" source "net/sched/Kconfig" source "net/dcb/Kconfig" @@ -229,7 +230,6 @@ source "net/can/Kconfig" source "net/irda/Kconfig" source "net/bluetooth/Kconfig" source "net/rxrpc/Kconfig" -source "net/phonet/Kconfig" config FIB_RULES bool