rpms/kernel/devel die-floppy-die.patch, NONE, 1.1 kernel.spec, 1.1695, 1.1696

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5586

Modified Files:
	kernel.spec 
Added Files:
	die-floppy-die.patch 
Log Message:
* Thu Aug 06 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.0.133.rc5.git3
- die-floppy-die.patch: it's the 21st century, let's not rely on
  steam powered technology.


die-floppy-die.patch:
 floppy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE die-floppy-die.patch ---
Kill the floppy.ko pnp modalias. We were surviving just fine without
autoloading floppy drivers, tyvm.

Please feel free to register all complaints in the wastepaper bin.

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 91b7530..2ea84a6 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4631,7 +4631,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
 	{ "PNP0700", 0 },
 	{ }
 };
-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
 
 #else
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1695
retrieving revision 1.1696
diff -u -p -r1.1695 -r1.1696
--- kernel.spec	5 Aug 2009 07:14:49 -0000	1.1695
+++ kernel.spec	6 Aug 2009 04:05:38 -0000	1.1696
@@ -639,6 +639,8 @@ Patch452: linux-2.6.30-no-pcspkr-modalia
 
 Patch460: linux-2.6-serial-460800.patch
 
+Patch470: die-floppy-die.patch
+
 Patch510: linux-2.6-silence-noise.patch
 Patch520: linux-2.6.30-hush-rom-warning.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -1221,6 +1223,9 @@ ApplyPatch alsa-tell-user-that-stream-to
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 
+# stop floppy.ko from autoloading during udev...
+ApplyPatch die-floppy-die.patch
+
 # Get away from having to poll Toshibas
 #ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
@@ -1946,6 +1951,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 06 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.0.133.rc5.git3
+- die-floppy-die.patch: it's the 21st century, let's not rely on
+  steam powered technology.
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.132.rc5.git3
 - revert-ftrace-powerpc-snafu.patch - fix ppc build