lkml.org 
[lkml]   [2009]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 17/35] floppy: provide a PNP device table in the module.
    2.6.29-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Scott James Remnant <scott@canonical.com>

    commit 83f9ef463bcb4ba7b4fee1d6212fac7d277010d3 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/block/floppy.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    --- a/drivers/block/floppy.c
    +++ b/drivers/block/floppy.c
    @@ -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>

    @@ -4598,6 +4599,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);



    \
     
     \ /
      Last update: 2009-07-01 03:03    [W:0.041 / U:119.936 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site