Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759500AbZGAAdt (ORCPT ); Tue, 30 Jun 2009 20:33:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759660AbZGAAaN (ORCPT ); Tue, 30 Jun 2009 20:30:13 -0400 Received: from kroah.org ([198.145.64.141]:34344 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759493AbZGAAaH (ORCPT ); Tue, 30 Jun 2009 20:30:07 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Tue Jun 30 17:03:58 2009 Message-Id: <20090701000358.476669583@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 30 Jun 2009 16:59:58 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Scott James Remnant , Tim Gardner , Bjorn Helgaas , Philippe De Muyter , Kay Sievers Subject: [patch 14/30] floppy: provide a PNP device table in the module. References: <20090630235944.868879272@mini.kroah.org> Content-Disposition: inline; filename=floppy-provide-a-pnp-device-table-in-the-module.patch In-Reply-To: <20090701002817.GA6156@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1933 Lines: 49 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Scott James Remnant 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 Signed-off-by: Tim Gardner Cc: Bjorn Helgaas Cc: Philippe De Muyter Acked-by: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- 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 #include #include +#include #include /* for invalidate_buffers() */ #include @@ -4572,6 +4573,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); -- 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/