Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-block.git] / drivers / net / wireless / ralink / rt2x00 / rt2400pci.c

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
index bb5685826c18a48c9e6d30becce864e75f19925d..13dd672b825e7b9bd1b283f65ab8428183ea8b8b 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
@@ -1023,9 +1023,9 @@ static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
 {
        u32 reg, reg2;
        unsigned int i;
-       char put_to_sleep;
-       char bbp_state;
-       char rf_state;
+       bool put_to_sleep;
+       u8 bbp_state;
+       u8 rf_state;
 
        put_to_sleep = (state != STATE_AWAKE);
 
@@ -1561,7 +1561,7 @@ static int rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 {
        struct hw_mode_spec *spec = &rt2x00dev->spec;
        struct channel_info *info;
-       char *tx_power;
+       u8 *tx_power;
        unsigned int i;
 
        /*