Commit 83f9ef46 authored Apr 02, 2009 by Scott James Remnant Committed by Linus Torvalds Apr 02, 2009

floppy: provide a PNP device table in the module.



The missing device table means that the floppy module is not auto-loaded,
even when the appropriate PNP device (0700) is found.

We don't actually use the table in the module, since the device doesn't
have a struct pnp_driver, but it's sufficient to cause an alias in the
module that udev/modprobe will use.

Signed-off-by: Scott James Remnant <scott@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Philippe De Muyter <phdm@macqel.be>
Acked-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 97f76d3d

drivers/block/floppy.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,7 @@ static int print_unex = 1;
		#include <linux/interrupt.h>
		#include <linux/init.h>
		#include <linux/platform_device.h>
		#include <linux/mod_devicetable.h>
		#include <linux/buffer_head.h> /* for invalidate_buffers() */
		#include <linux/mutex.h>

		@@ -4597,6 +4598,13 @@ MODULE_AUTHOR("Alain L. Knaff");
		MODULE_SUPPORTED_DEVICE("fd");
		MODULE_LICENSE("GPL");

		/* This doesn't actually get used other than for module information */
		static const struct pnp_device_id floppy_pnpids[] = {
		{ "PNP0700", 0 },
		{ }
		};
		MODULE_DEVICE_TABLE(pnp, floppy_pnpids);

		#else

		__setup("floppy=", floppy_setup);

Admin message