lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Browse Source 
Conflicts:

	sound/pci/Kconfig
This commit is contained in:
David Woodhouse
2008-07-14 15:49:04 -07:00
parent a41eebab75 d71792ac3d
commit 751851af7a
181 changed files with 29649 additions and 50283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/rt2x00/rt61pci.c
View File

@ -915,7 +915,7 @@ static char *rt61pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
return fw_name;
}
static u16 rt61pci_get_firmware_crc(void *data, const size_t len)
static u16 rt61pci_get_firmware_crc(const void *data, const size_t len)
{
u16 crc;
@ -932,7 +932,7 @@ static u16 rt61pci_get_firmware_crc(void *data, const size_t len)
return crc;
}
static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data,
const size_t len)
{
int i;