Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338121
b: refs/heads/master
c: 4cd2b92
h: refs/heads/master
i:
  338119: d8138aa
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent ba90515 commit aa1793f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db53ac71fe7e16add7be58985a1eb2aeb46dc8b0
refs/heads/master: 4cd2b92de30f511aa6b203cbff2692aa09dc1226
4 changes: 2 additions & 2 deletions trunk/drivers/staging/sbe-2t3e3/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit aa1793f

Please sign in to comment.