← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to drivers/block/floppy.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-07-11 13:31:31 UTC
  • mfrom: (14.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090711133131-omdhleccno39rayr
Tags: 2.6.29.6-1.1
New upstream kernel and RT patchset release

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/block/floppy.c
177
177
#include <linux/interrupt.h>
178
178
#include <linux/init.h>
179
179
#include <linux/platform_device.h>
 
180
#include <linux/mod_devicetable.h>
180
181
#include <linux/buffer_head.h>  /* for invalidate_buffers() */
181
182
#include <linux/mutex.h>
182
183
 
4598
4599
MODULE_SUPPORTED_DEVICE("fd");
4599
4600
MODULE_LICENSE("GPL");
4600
4601
 
 
4602
/* This doesn't actually get used other than for module information */
 
4603
static const struct pnp_device_id floppy_pnpids[] = {
 
4604
        { "PNP0700", 0 },
 
4605
        { }
 
4606
};
 
4607
MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
 
4608
 
4601
4609
#else
4602
4610
 
4603
4611
__setup("floppy=", floppy_setup);