diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wan/cycx_main.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wan/cycx_main.c')
| -rw-r--r-- | drivers/net/wan/cycx_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c index a0e8611ad8e8..859dba9b972e 100644 --- a/drivers/net/wan/cycx_main.c +++ b/drivers/net/wan/cycx_main.c | |||
| @@ -81,9 +81,9 @@ static irqreturn_t cycx_isr(int irq, void *dev_id); | |||
| 81 | */ | 81 | */ |
| 82 | 82 | ||
| 83 | /* private data */ | 83 | /* private data */ |
| 84 | static char cycx_drvname[] = "cyclomx"; | 84 | static const char cycx_drvname[] = "cyclomx"; |
| 85 | static char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver"; | 85 | static const char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver"; |
| 86 | static char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " | 86 | static const char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " |
| 87 | "<acme@conectiva.com.br>"; | 87 | "<acme@conectiva.com.br>"; |
| 88 | static int cycx_ncards = CONFIG_CYCX_CARDS; | 88 | static int cycx_ncards = CONFIG_CYCX_CARDS; |
| 89 | static struct cycx_device *cycx_card_array; /* adapter data space */ | 89 | static struct cycx_device *cycx_card_array; /* adapter data space */ |