diff options
author | Steve French <sfrench@us.ibm.com> | 2008-05-06 19:55:32 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 19:55:32 +0200 |
commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /drivers/net/bfin_mac.h | |
parent | [CIFS] fix typo (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
download | linux-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.xz linux-a815752ac0ffdb910e92958d41d28f4fb28e5296.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/bfin_mac.h')
-rw-r--r-- | drivers/net/bfin_mac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h index f774d5a36942..beff51064ff4 100644 --- a/drivers/net/bfin_mac.h +++ b/drivers/net/bfin_mac.h @@ -49,7 +49,7 @@ struct net_dma_desc_tx { struct status_area_tx status; }; -struct bf537mac_local { +struct bfin_mac_local { /* * these are things that the kernel wants me to keep, so users * can find out semi-useless statistics of how well the card is |