diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2012-05-03 13:15:22 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2012-05-03 13:15:22 -0500 |
| commit | 7b4b4392628b7f9dfe879e3e8e92c47971c1a09f (patch) | |
| tree | 0cffb2c9dda526e19d1629eec062de728b1081b3 | |
| parent | 0aa5ea63d797dec9290bb73a6f2935a84ffced51 (diff) | |
| download | kernel-7b4b4392628b7f9dfe879e3e8e92c47971c1a09f.tar.gz kernel-7b4b4392628b7f9dfe879e3e8e92c47971c1a09f.tar.xz kernel-7b4b4392628b7f9dfe879e3e8e92c47971c1a09f.zip | |
Reenable slip and add to module-extras (rhbz 818308)
| -rw-r--r-- | config-generic | 5 | ||||
| -rw-r--r-- | kernel.spec | 3 | ||||
| -rw-r--r-- | mod-extra.list | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 9d6be3c27..278f040a5 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 de6d09ecc..75d0d8be5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2326,6 +2326,9 @@ fi # ||----w | # || || %changelog +* Thu May 03 2012 Justin M. Forbes <jforbes@redhat.com> +- Reenable slip and add to module-extras (rhbz 818308) + * Wed May 02 2012 Josh Boyer <jwboyer@redhat.com> - Disable PCIEPORTBUS on ppc64 per IBM request diff --git a/mod-extra.list b/mod-extra.list index 7176a736e..a99603327 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 |