diff options
| -rw-r--r-- | die-floppy-die.patch | 29 | ||||
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | mod-extra.list | 2 | ||||
| -rw-r--r-- | no-pcspkr-modalias.patch | 22 |
4 files changed, 2 insertions, 55 deletions
diff --git a/die-floppy-die.patch b/die-floppy-die.patch deleted file mode 100644 index caaa2dde5..000000000 --- a/die-floppy-die.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Kyle McMartin <kyle@phobos.i.jkkm.org> -Date: Tue, 30 Mar 2010 00:04:29 -0400 -Subject: [PATCH] die-floppy-die - -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. - -Bugzilla: N/A -Upstream-status: Fedora mustard ---- - drivers/block/floppy.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index a08cda955285..e320e1e679cf 100644 ---- a/drivers/block/floppy.c -+++ b/drivers/block/floppy.c -@@ -4633,8 +4633,7 @@ static const struct pnp_device_id floppy_pnpids[] = { - {"PNP0700", 0}, - {} - }; -- --MODULE_DEVICE_TABLE(pnp, floppy_pnpids); -+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */ - - #else - diff --git a/kernel.spec b/kernel.spec index ebadd7bd8..a3fba98b7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -497,10 +497,6 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz Patch111: input-kill-stupid-messages.patch -Patch112: die-floppy-die.patch - -Patch113: no-pcspkr-modalias.patch - Patch115: Kbuild-Add-an-option-to-enable-GCC-VTA.patch Patch116: crash-driver.patch diff --git a/mod-extra.list b/mod-extra.list index d58f80283..8140f5c9e 100644 --- a/mod-extra.list +++ b/mod-extra.list @@ -48,6 +48,7 @@ ems_pci.ko ems_usb.ko esd_usb2.ko esi-sir.ko +floppy.ko gamecon.ko gf2k.ko gfs2.ko @@ -113,6 +114,7 @@ orinoco_nortel.ko orinoco_pci.ko orinoco_plx.ko orinoco_usb.ko +pcspkr.ko plx_pci.ko pn_pep.ko pppoatm.ko diff --git a/no-pcspkr-modalias.patch b/no-pcspkr-modalias.patch deleted file mode 100644 index 2ccd87202..000000000 --- a/no-pcspkr-modalias.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org> -Date: Thu, 29 Jul 2010 16:46:31 -0700 -Subject: [PATCH] no pcspkr modalias - -Bugzilla: N/A -Upstream-status: Fedora mustard ---- - drivers/input/misc/pcspkr.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c -index 56ddba21de84..23534f420e68 100644 ---- a/drivers/input/misc/pcspkr.c -+++ b/drivers/input/misc/pcspkr.c -@@ -23,7 +23,6 @@ - MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); - MODULE_DESCRIPTION("PC Speaker beeper driver"); - MODULE_LICENSE("GPL"); --MODULE_ALIAS("platform:pcspkr"); - - static int pcspkr_event(struct input_dev *dev, unsigned int type, - unsigned int code, int value) |