Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / net / bfin_mac.h

diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index f774d5a..beff510 100644 (file)
--- 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