diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /drivers/net/pcmcia/nmclan_cs.c | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 8a5ae3b182ed..12e3233868e9 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
| @@ -1402,7 +1402,6 @@ static void BuildLAF(int *ladrf, int *adr) | |||
| 1402 | for (i = 0; i < 8; i++) | 1402 | for (i = 0; i < 8; i++) |
| 1403 | printk(KERN_CONT " %02X", ladrf[i]); | 1403 | printk(KERN_CONT " %02X", ladrf[i]); |
| 1404 | printk(KERN_CONT "\n"); | 1404 | printk(KERN_CONT "\n"); |
| 1405 | } | ||
| 1406 | #endif | 1405 | #endif |
| 1407 | } /* BuildLAF */ | 1406 | } /* BuildLAF */ |
| 1408 | 1407 | ||