diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 9fab0df18c3c..07b03b3c7ef1 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
| @@ -487,8 +487,8 @@ struct rt2x00lib_ops { | |||
| 487 | */ | 487 | */ |
| 488 | int (*probe_hw) (struct rt2x00_dev *rt2x00dev); | 488 | int (*probe_hw) (struct rt2x00_dev *rt2x00dev); |
| 489 | char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev); | 489 | char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev); |
| 490 | u16 (*get_firmware_crc) (void *data, const size_t len); | 490 | u16 (*get_firmware_crc) (const void *data, const size_t len); |
| 491 | int (*load_firmware) (struct rt2x00_dev *rt2x00dev, void *data, | 491 | int (*load_firmware) (struct rt2x00_dev *rt2x00dev, const void *data, |
| 492 | const size_t len); | 492 | const size_t len); |
| 493 | 493 | ||
| 494 | /* | 494 | /* |