diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/cxt1e1/linux.c | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/cxt1e1/linux.c')
| -rw-r--r-- | drivers/staging/cxt1e1/linux.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index eb0f4bd..c793028 100644 --- a/drivers/staging/cxt1e1/linux.c +++ b/drivers/staging/cxt1e1/linux.c @@ -112,13 +112,13 @@ int log_level = LOG_ERROR; int log_level_default = LOG_ERROR; module_param(log_level, int, 0444); -int max_mru = MUSYCC_MRU; +int cxt1e1_max_mru = MUSYCC_MRU; int max_mru_default = MUSYCC_MRU; -module_param(max_mru, int, 0444); +module_param(cxt1e1_max_mru, int, 0444); -int max_mtu = MUSYCC_MTU; +int cxt1e1_max_mtu = MUSYCC_MTU; int max_mtu_default = MUSYCC_MTU; -module_param(max_mtu, int, 0444); +module_param(cxt1e1_max_mtu, int, 0444); int max_txdesc_used = MUSYCC_TXDESC_MIN; int max_txdesc_default = MUSYCC_TXDESC_MIN; @@ -1118,12 +1118,12 @@ c4_mod_init (void) if (log_level != log_level_default) pr_info("NOTE: driver parameter <log_level> changed from default %d to %d.\n", log_level_default, log_level); - if (max_mru != max_mru_default) - pr_info("NOTE: driver parameter <max_mru> changed from default %d to %d.\n", - max_mru_default, max_mru); - if (max_mtu != max_mtu_default) - pr_info("NOTE: driver parameter <max_mtu> changed from default %d to %d.\n", - max_mtu_default, max_mtu); + if (cxt1e1_max_mru != max_mru_default) + pr_info("NOTE: driver parameter <cxt1e1_max_mru> changed from default %d to %d.\n", + max_mru_default, cxt1e1_max_mru); + if (cxt1e1_max_mtu != max_mtu_default) + pr_info("NOTE: driver parameter <cxt1e1_max_mtu> changed from default %d to %d.\n", + max_mtu_default, cxt1e1_max_mtu); if (max_rxdesc_used != max_rxdesc_default) { if (max_rxdesc_used > 2000) |
