Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756364AbZCFSbJ (ORCPT ); Fri, 6 Mar 2009 13:31:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751276AbZCFSaz (ORCPT ); Fri, 6 Mar 2009 13:30:55 -0500 Received: from rv-out-0506.google.com ([209.85.198.230]:24211 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753240AbZCFSaz convert rfc822-to-8bit (ORCPT ); Fri, 6 Mar 2009 13:30:55 -0500 MIME-Version: 1.0 In-Reply-To: References: Date: Fri, 6 Mar 2009 19:30:52 +0100 Message-ID: Subject: Re: [PATCH] floppy: Provide a PNP device table in the module. From: Kay Sievers To: Scott James Remnant Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1756 Lines: 48 On Fri, Mar 6, 2009 at 18:50, Scott James Remnant wrote: > 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 > Signed-off-by: Tim Gardner > --- >  drivers/block/floppy.c |    8 ++++++++ >  1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c > index 83d8ed3..7aa1264 100644 > --- a/drivers/block/floppy.c > +++ b/drivers/block/floppy.c > @@ -177,6 +177,7 @@ static int print_unex = 1; >  #include >  #include >  #include > +#include >  #include /* for invalidate_buffers() */ >  #include > > @@ -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); > + Looks good to me. Thanks for doing that. Acked-by: Kay Sievers Kay -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/