diff --git a/[refs] b/[refs] index 178833908f0f..d8940998e288 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f982307f22db96201e41540295f24e8dcc10c78f +refs/heads/master: e2c709b0ba2886b5438b666222b4b3faf82d65a9 diff --git a/trunk/drivers/net/wan/Kconfig b/trunk/drivers/net/wan/Kconfig index 846be60e7821..91fb395a94fa 100644 --- a/trunk/drivers/net/wan/Kconfig +++ b/trunk/drivers/net/wan/Kconfig @@ -154,8 +154,6 @@ config HDLC_PPP help Generic HDLC driver supporting PPP over WAN connections. - It will be replaced by new PPP implementation in Linux 2.6.26. - If unsure, say N. config HDLC_X25