diff options
| author | Bob Beers <bob.beers@gmail.com> | 2010-10-16 18:06:36 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-19 10:12:14 -0700 |
| commit | c694ed85eab4e7966cd83fca509ce27494e3e296 (patch) | |
| tree | cd3d0b4e76555620847ecdf496212c959a94e745 /drivers/staging/cxt1e1/sbeproc.c | |
| parent | b3495cebaaa64c9e6df9ab663dfb75e86a08f9ce (diff) | |
Staging: cxt1e1: multiple definition of max_mtu fix
eliminate multiple definition of max_mtu by renaming
with cxt1e1_ prefix, similarly rename max_mru
Signed-off-by: Bob Beers <bbeers@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/cxt1e1/sbeproc.c')
| -rw-r--r-- | drivers/staging/cxt1e1/sbeproc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c index c3eed4bc6d7..70b9b33f352 100644 --- a/drivers/staging/cxt1e1/sbeproc.c +++ b/drivers/staging/cxt1e1/sbeproc.c @@ -171,17 +171,17 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset, #ifdef SBE_PMCC4_ENABLE { - extern int max_mru; + extern int cxt1e1_max_mru; #if 0 extern int max_chans_used; - extern int max_mtu; + extern int cxt1e1_max_mtu; #endif extern int max_rxdesc_used, max_txdesc_used; - len += sprintf (buffer + len, "\nmax_mru: %d\n", max_mru); + len += sprintf (buffer + len, "\ncxt1e1_max_mru: %d\n", cxt1e1_max_mru); #if 0 len += sprintf (buffer + len, "\nmax_chans_used: %d\n", max_chans_used); - len += sprintf (buffer + len, "max_mtu: %d\n", max_mtu); + len += sprintf (buffer + len, "cxt1e1_max_mtu: %d\n", cxt1e1_max_mtu); #endif len += sprintf (buffer + len, "max_rxdesc_used: %d\n", max_rxdesc_used); len += sprintf (buffer + len, "max_txdesc_used: %d\n", max_txdesc_used); |