diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/net/wireless/rt2x00/rt61pci.c | |
parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index c3afb5cbe807..580f90b63de7 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -915,7 +915,7 @@ static char *rt61pci_get_firmware_name(struct rt2x00_dev *rt2x00dev) | |||
915 | return fw_name; | 915 | return fw_name; |
916 | } | 916 | } |
917 | 917 | ||
918 | static u16 rt61pci_get_firmware_crc(void *data, const size_t len) | 918 | static u16 rt61pci_get_firmware_crc(const void *data, const size_t len) |
919 | { | 919 | { |
920 | u16 crc; | 920 | u16 crc; |
921 | 921 | ||
@@ -932,7 +932,7 @@ static u16 rt61pci_get_firmware_crc(void *data, const size_t len) | |||
932 | return crc; | 932 | return crc; |
933 | } | 933 | } |
934 | 934 | ||
935 | static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data, | 935 | static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data, |
936 | const size_t len) | 936 | const size_t len) |
937 | { | 937 | { |
938 | int i; | 938 | int i; |