diff --git a/config-generic b/config-generic index de763aa56..7477e8852 100644 --- a/config-generic +++ b/config-generic @@ -1473,7 +1473,7 @@ CONFIG_SFC_MTD=y # CONFIG_DEFXX is not set # CONFIG_SKFP is not set # CONFIG_HIPPI is not set -CONFIG_PLIP=m +# CONFIG_PLIP is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y @@ -1481,13 +1481,10 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_IPPP_FILTER=y -# CONFIG_PPP_BSDCOMP is not set +CONFIG_PPP_BSDCOMP=y CONFIG_PPPOE=m CONFIG_PPP_MPPE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_SLIP is not set # # Wireless LAN diff --git a/kernel.spec b/kernel.spec index 84b8e98e7..52877447a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2317,6 +2317,9 @@ fi # ||----w | # || || %changelog +* Fri Jan 13 2012 Dave Jones +- Disable PLIP, Enable PPP BSDCOMP, Disable SLIP + * Fri Jan 13 2012 Josh Boyer - Fix verbose logging messages in the rtl8192cu driver (rhbz 728740)