[PATCH 1/1] UBUNTU: SAUCE: floppy: Provide a PnP device table in the module.

[Tim Gardner]

Andy Whitcroft wrote:
> From: Scott James Remnant <scott at canonical.com>
> 
> Bug: #255651
> 
> The missing device table means that the floppy module is not auto-loaded
> when the appropriate PNP device is found.
> 
> We don't actually use this in the module, it's just there for modprobe's
> own reasons.
> 
> Signed-off-by: Scott James Remnant <scott at canonical.com>
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> ---
>  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 395f8ea..5a1faa2 100644
> --- 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>
>  
> @@ -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);

ACK

-- 
Tim Gardner tim.gardner at canonical.com