diff --git a/config-generic b/config-generic index 9d6be3c..278f040 100644 --- a/config-generic +++ b/config-generic @@ -1391,7 +1391,10 @@ CONFIG_IPPP_FILTER=y CONFIG_PPP_BSDCOMP=y CONFIG_PPPOE=m CONFIG_PPP_MPPE=m -# CONFIG_SLIP is not set +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set # # Wireless LAN diff --git a/kernel.spec b/kernel.spec index de6d09e..75d0d8b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2326,6 +2326,9 @@ fi # ||----w | # || || %changelog +* Thu May 03 2012 Justin M. Forbes +- Reenable slip and add to module-extras (rhbz 818308) + * Wed May 02 2012 Josh Boyer - Disable PCIEPORTBUS on ppc64 per IBM request diff --git a/mod-extra.list b/mod-extra.list index 7176a73..a996033 100644 --- a/mod-extra.list +++ b/mod-extra.list @@ -175,3 +175,4 @@ tpm_atmel.ko tpm_infineon.ko tpm_nsc.ko tpm_tis.ko +slip.ko