[kernel] Move yenta_socket back into main kernel package

[Josh Boyer]

commit 884a3e1f3c38d84d372e19a892456de87080e5d4
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Dec 6 09:19:39 2011 -0500

    Move yenta_socket back into main kernel package
    
    One day, pcmcia will be like the old MCA bus.  Hopefully that day is soon.

 kernel.spec    |    2 +-
 mod-extra.list |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index c82d335..1a39540 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2214,7 +2214,7 @@ fi
 #                 ||     ||
 %changelog
 * Tue Dec 06 2011 Josh Boyer <jwboyer at redhat.com>
-- Move 802.1q back into the main kernel package
+- Move 802.1q and yenta_socket back into the main kernel package
 
 * Mon Dec 05 2011 Josh Boyer <jwboyer at redhat.com>
 - Only print the apm_cpu_idle message once (rhbz #760341)
diff --git a/mod-extra.list b/mod-extra.list
index 870b8c7..68d9dbf 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -1,5 +1,4 @@
 aer_inject.ko
-yenta_socket.ko
 tcp_bic.ko
 tcp_westwood.ko
 tcp_htcp.ko