From aa1793fd71ed62dd501da5c4420890f4d40d1b78 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:22:14 -0500 Subject: [PATCH] --- yaml --- r: 338121 b: refs/heads/master c: 4cd2b92de30f511aa6b203cbff2692aa09dc1226 h: refs/heads/master i: 338119: d8138aa56baa803215985c54eae33cbf81e742d9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sbe-2t3e3/module.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6fa8daecff23..0a54c7cfc2b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db53ac71fe7e16add7be58985a1eb2aeb46dc8b0 +refs/heads/master: 4cd2b92de30f511aa6b203cbff2692aa09dc1226 diff --git a/trunk/drivers/staging/sbe-2t3e3/module.c b/trunk/drivers/staging/sbe-2t3e3/module.c index 8e1a043b6b9f..69b451ee830b 100644 --- a/trunk/drivers/staging/sbe-2t3e3/module.c +++ b/trunk/drivers/staging/sbe-2t3e3/module.c @@ -52,7 +52,7 @@ static void t3e3_remove_channel(struct channel *channel) pci_set_drvdata(pdev, NULL); } -static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *pdev, struct card *card) +static int t3e3_init_channel(struct channel *channel, struct pci_dev *pdev, struct card *card) { struct net_device *dev; unsigned int val; @@ -131,7 +131,7 @@ static void __devexit t3e3_remove_card(struct pci_dev *pdev) kfree(card); } -static int __devinit t3e3_init_card(struct pci_dev *pdev, const struct pci_device_id *ent) +static int t3e3_init_card(struct pci_dev *pdev, const struct pci_device_id *ent) { /* pdev points to channel #0 */ struct pci_dev *pdev1 = NULL;