diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 15:50:51 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 15:50:51 +0100 |
commit | b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7 (patch) | |
tree | 030ef62361042d1a034087ad9a726db3b57bba72 /drivers/net/pcmcia/nmclan_cs.c | |
parent | NTFS: Fix two compiler warnings on Alpha. Thanks to Andrew Morton for (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
download | linux-b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7.tar.xz linux-b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7.zip |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 4a232254a497..787176c57fd9 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c @@ -388,7 +388,7 @@ static char *version = DRV_NAME " " DRV_VERSION " (Roger C. Pao)"; #endif -static char *if_names[]={ +static const char *if_names[]={ "Auto", "10baseT", "BNC", }; |