diff options
author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-01-30 07:00:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-01 14:40:01 -0500 |
commit | dc7cdf6c6bfc837501ea403a73eec78a350b1f7f (patch) | |
tree | 09c498d0bd222adbe490070ee503aa11f854f215 /drivers | |
parent | d45b9d39a1aed7851948460d29b843ce70eb0a68 (diff) |
hamradio: fix incompatible pointer in module parameter
Fixed 'warning: return from incompatible pointer type' related
to module parameters.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/baycom_par.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 9537aaa50c2f..49b8b58fc5c6 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
@@ -1162,7 +1162,7 @@ static void baycom_probe(struct net_device *dev) | |||
1162 | /* | 1162 | /* |
1163 | * command line settable parameters | 1163 | * command line settable parameters |
1164 | */ | 1164 | */ |
1165 | static const char *mode[NR_PORTS] = { "", }; | 1165 | static char *mode[NR_PORTS] = { "", }; |
1166 | static int iobase[NR_PORTS] = { 0x378, }; | 1166 | static int iobase[NR_PORTS] = { 0x378, }; |
1167 | 1167 | ||
1168 | module_param_array(mode, charp, NULL, 0); | 1168 | module_param_array(mode, charp, NULL, 0); |
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index 279d2296290a..f1aea0c98333 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c | |||
@@ -477,7 +477,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, | |||
477 | /* | 477 | /* |
478 | * command line settable parameters | 478 | * command line settable parameters |
479 | */ | 479 | */ |
480 | static const char *mode[NR_PORTS] = { "picpar", }; | 480 | static char *mode[NR_PORTS] = { "picpar", }; |
481 | static int iobase[NR_PORTS] = { 0x378, }; | 481 | static int iobase[NR_PORTS] = { 0x378, }; |
482 | 482 | ||
483 | module_param_array(mode, charp, NULL, 0); | 483 | module_param_array(mode, charp, NULL, 0); |