diff --git a/[refs] b/[refs] index f2e21f33131f..0e5c65067fb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1eaea46bb4020b38a141b84f88565d4603f8dd0 +refs/heads/master: 972c196266d5982766ca03590d54e6a0d4de5664 diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig index 51a57009aec8..e21175be25d0 100644 --- a/trunk/drivers/char/Kconfig +++ b/trunk/drivers/char/Kconfig @@ -284,6 +284,7 @@ config N_HDLC config N_GSM tristate "GSM MUX line discipline support (EXPERIMENTAL)" depends on EXPERIMENTAL + depends on NET help This line discipline provides support for the GSM MUX protocol and presents the mux as a set of 61 individual tty devices.