Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122914
b: refs/heads/master
c: 27cd6ae
h: refs/heads/master
v: v3
  • Loading branch information
Hannes Eder authored and David S. Miller committed Dec 26, 2008
1 parent 9b7afb1 commit 719211a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 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: 409b204435b85f7e159230c216f334a862cb3b95
refs/heads/master: 27cd6ae5619084f363630683e77d70be38075afe
4 changes: 2 additions & 2 deletions trunk/drivers/net/tokenring/ibmtr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1837,8 +1837,8 @@ static void ibmtr_reset_timer(struct timer_list *tmr, struct net_device *dev)

/*****************************************************************************/

void tok_rerun(unsigned long dev_addr){

static void tok_rerun(unsigned long dev_addr)
{
struct net_device *dev = (struct net_device *)dev_addr;
struct tok_info *ti = netdev_priv(dev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/tokenring/madgemc.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ static irqreturn_t madgemc_interrupt(int irq, void *dev_id)
* zero to leave the TMS NSELOUT bits unaffected.
*
*/
unsigned short madgemc_setnselout_pins(struct net_device *dev)
static unsigned short madgemc_setnselout_pins(struct net_device *dev)
{
unsigned char reg1;
struct net_local *tp = netdev_priv(dev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/tokenring/proteon.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ static void proteon_read_eeprom(struct net_device *dev)
dev->dev_addr[i] = proteon_sifreadw(dev, SIFINC) >> 8;
}

unsigned short proteon_setnselout_pins(struct net_device *dev)
static unsigned short proteon_setnselout_pins(struct net_device *dev)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/tokenring/skisa.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static void sk_isa_read_eeprom(struct net_device *dev)
dev->dev_addr[i] = sk_isa_sifreadw(dev, SIFINC) >> 8;
}

unsigned short sk_isa_setnselout_pins(struct net_device *dev)
static unsigned short sk_isa_setnselout_pins(struct net_device *dev)
{
return 0;
}
Expand Down

0 comments on commit 719211a

Please sign in to comment.