rpms/kernel/F-11 linux-2.6-defaults-die-floppy-die.patch, NONE, 1.1 kernel.spec, 1.1721, 1.1722

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25859

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-defaults-die-floppy-die.patch 
Log Message:
Don't load the floppy driver automatically:
  linux-2.6-defaults-die-floppy-die.patch

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

--- NEW FILE linux-2.6-defaults-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/F-11/kernel.spec,v
retrieving revision 1.1721
retrieving revision 1.1722
diff -u -p -r1.1721 -r1.1722
--- kernel.spec	27 Aug 2009 22:50:02 -0000	1.1721
+++ kernel.spec	28 Aug 2009 01:02:02 -0000	1.1722
@@ -624,6 +624,7 @@ Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
+Patch392: linux-2.6-defaults-die-floppy-die.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
 Patch452: linux-2.6-input-wacom-bluetooth.patch
@@ -1267,6 +1268,8 @@ ApplyPatch linux-2.6-xen-clean-up-warnin
 # Misc fixes
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
+# don't load the floppy driver by default
+ApplyPatch linux-2.6-defaults-die-floppy-die.patch
 
 # Get away from having to poll Toshibas
 ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
@@ -1962,6 +1965,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-43
+- Don't load the floppy driver automatically:
+  linux-2.6-defaults-die-floppy-die.patch
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-42
 - Fix stackprotector problems with Xen on x86_64.
 - Disable stackprotector on i386 until 32-bit Xen gets fixed.