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/usb/atm/cxacru.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/usb/atm/cxacru.c')
| -rw-r--r-- | drivers/usb/atm/cxacru.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 5ea3093bc40f..90583d6a5949 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
| @@ -820,7 +820,7 @@ reschedule: | |||
| 820 | } | 820 | } |
| 821 | 821 | ||
| 822 | static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw, | 822 | static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw, |
| 823 | u8 code1, u8 code2, u32 addr, u8 *data, int size) | 823 | u8 code1, u8 code2, u32 addr, const u8 *data, int size) |
| 824 | { | 824 | { |
| 825 | int ret; | 825 | int ret; |
| 826 | u8 *buf; | 826 | u8 *buf; |