← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/watchdog/nv_tco.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/watchdog/nv_tco.c
289
289
 * register a pci_driver, because someone else might one day
290
290
 * want to register another driver on the same PCI id.
291
291
 */
292
 
static struct pci_device_id tco_pci_tbl[] = {
 
292
static DEFINE_PCI_DEVICE_TABLE(tco_pci_tbl) = {
293
293
        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS,
294
294
          PCI_ANY_ID, PCI_ANY_ID, },
295
295
        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
302
302
 *      Init & exit routines
303
303
 */
304
304
 
305
 
static unsigned char __init nv_tco_getdevice(void)
 
305
static unsigned char __devinit nv_tco_getdevice(void)
306
306
{
307
307
        struct pci_dev *dev = NULL;
308
308
        u32 val;