summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-12-06 08:50:15 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-12-06 08:50:15 -0500
commit61b173509e77f67a90bd81a5343836b2f78c9dc6 (patch)
treeea55ca3a5c4dcc4e7e9b35f5b420293a1ba42b81
parent4787052cbdb26a678154d99d06744cd12d4489fc (diff)
downloadkernel-61b173509e77f67a90bd81a5343836b2f78c9dc6.tar.gz
kernel-61b173509e77f67a90bd81a5343836b2f78c9dc6.tar.xz
kernel-61b173509e77f67a90bd81a5343836b2f78c9dc6.zip
Move 802.1q back into the main kernel package
-rw-r--r--kernel.spec3
-rw-r--r--mod-extra.list1
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index d0d0d6783..c82d3359b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2213,6 +2213,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Dec 06 2011 Josh Boyer <jwboyer@redhat.com>
+- Move 802.1q back into the main kernel package
+
* Mon Dec 05 2011 Josh Boyer <jwboyer@redhat.com>
- Only print the apm_cpu_idle message once (rhbz #760341)
diff --git a/mod-extra.list b/mod-extra.list
index 2b605656f..870b8c716 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -32,7 +32,6 @@ l2tp_eth.ko
l2tp_ip.ko
l2tp_netlink.ko
l2tp_ppp.ko
-8021q.ko
llc.ko
ipx.ko
appletalk.ko