diff options
Diffstat (limited to 'drivers/net/ibm_newemac/core.c')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 89c82c5e63e4..3fae87559791 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | * | 24 | * | 
| 25 | */ | 25 | */ | 
| 26 | 26 | ||
| 27 | #include <linux/module.h> | ||
| 27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> | 
| 28 | #include <linux/string.h> | 29 | #include <linux/string.h> | 
| 29 | #include <linux/errno.h> | 30 | #include <linux/errno.h> | 
| @@ -443,7 +444,7 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s | |||
| 443 | ret |= EMAC_MR1_TFS_2K; | 444 | ret |= EMAC_MR1_TFS_2K; | 
| 444 | break; | 445 | break; | 
| 445 | default: | 446 | default: | 
| 446 | printk(KERN_WARNING "%s: Unknown Rx FIFO size %d\n", | 447 | printk(KERN_WARNING "%s: Unknown Tx FIFO size %d\n", | 
| 447 | dev->ndev->name, tx_size); | 448 | dev->ndev->name, tx_size); | 
| 448 | } | 449 | } | 
| 449 | 450 | ||
| @@ -470,6 +471,9 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_ | |||
| 470 | DBG2(dev, "__emac4_calc_base_mr1" NL); | 471 | DBG2(dev, "__emac4_calc_base_mr1" NL); | 
| 471 | 472 | ||
| 472 | switch(tx_size) { | 473 | switch(tx_size) { | 
| 474 | case 16384: | ||
| 475 | ret |= EMAC4_MR1_TFS_16K; | ||
| 476 | break; | ||
| 473 | case 4096: | 477 | case 4096: | 
| 474 | ret |= EMAC4_MR1_TFS_4K; | 478 | ret |= EMAC4_MR1_TFS_4K; | 
| 475 | break; | 479 | break; | 
| @@ -477,7 +481,7 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_ | |||
| 477 | ret |= EMAC4_MR1_TFS_2K; | 481 | ret |= EMAC4_MR1_TFS_2K; | 
| 478 | break; | 482 | break; | 
| 479 | default: | 483 | default: | 
| 480 | printk(KERN_WARNING "%s: Unknown Rx FIFO size %d\n", | 484 | printk(KERN_WARNING "%s: Unknown Tx FIFO size %d\n", | 
| 481 | dev->ndev->name, tx_size); | 485 | dev->ndev->name, tx_size); | 
| 482 | } | 486 | } | 
| 483 | 487 | ||
| @@ -2985,6 +2989,7 @@ static struct of_device_id emac_match[] = | |||
| 2985 | }, | 2989 | }, | 
| 2986 | {}, | 2990 | {}, | 
| 2987 | }; | 2991 | }; | 
| 2992 | MODULE_DEVICE_TABLE(of, emac_match); | ||
| 2988 | 2993 | ||
| 2989 | static struct of_platform_driver emac_driver = { | 2994 | static struct of_platform_driver emac_driver = { | 
| 2990 | .name = "emac", | 2995 | .name = "emac", | 
