aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/vlsi_ir.c
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
commit8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
treea8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/net/irda/vlsi_ir.c
parent406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
Patched in Tegra support.
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
-rw-r--r--drivers/net/irda/vlsi_ir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 2f99f8881df..9021d013172 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1627,7 +1627,7 @@ static int vlsi_irda_init(struct net_device *ndev)
1627 1627
1628/**************************************************************/ 1628/**************************************************************/
1629 1629
1630static int 1630static int __devinit
1631vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) 1631vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1632{ 1632{
1633 struct net_device *ndev; 1633 struct net_device *ndev;
@@ -1699,7 +1699,7 @@ out:
1699 return -ENODEV; 1699 return -ENODEV;
1700} 1700}
1701 1701
1702static void vlsi_irda_remove(struct pci_dev *pdev) 1702static void __devexit vlsi_irda_remove(struct pci_dev *pdev)
1703{ 1703{
1704 struct net_device *ndev = pci_get_drvdata(pdev); 1704 struct net_device *ndev = pci_get_drvdata(pdev);
1705 vlsi_irda_dev_t *idev; 1705 vlsi_irda_dev_t *idev;
@@ -1832,7 +1832,7 @@ static struct pci_driver vlsi_irda_driver = {
1832 .name = drivername, 1832 .name = drivername,
1833 .id_table = vlsi_irda_table, 1833 .id_table = vlsi_irda_table,
1834 .probe = vlsi_irda_probe, 1834 .probe = vlsi_irda_probe,
1835 .remove = vlsi_irda_remove, 1835 .remove = __devexit_p(vlsi_irda_remove),
1836#ifdef CONFIG_PM 1836#ifdef CONFIG_PM
1837 .suspend = vlsi_irda_suspend, 1837 .suspend = vlsi_irda_suspend,
1838 .resume = vlsi_irda_resume, 1838 .resume = vlsi_irda_resume,