diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 18:27:15 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 18:27:15 +0000 |
| commit | c67fe7392e989f369f5af0bf5a3a9908efb6ca5c (patch) | |
| tree | 64ddcef7ee3fd0a40e9d237c1e5e38d18862d8f4 /wcusb.c | |
| parent | 5357ea9f7435fe331279f00921b7d28020606192 (diff) | |
kernel 2.6.19 API changes compatibility
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1697 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcusb.c')
| -rw-r--r-- | wcusb.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -184,7 +184,7 @@ static int Wcusb_ReadWcRegs(struct usb_device *dev, unsigned char index, } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)); static int wcusb_async_write(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)); static void wcusb_async_control(struct urb *urb, struct pt_regs *regs); @@ -220,7 +220,7 @@ static void proslic_write_direct_async(struct wc_usb_pvt *p, unsigned char addre } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void wcusb_async_control(struct urb *urb, struct pt_regs *regs) #else static void wcusb_async_control(struct urb *urb) @@ -312,7 +312,7 @@ static void wcusb_async_control(urb_t *urb) } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void keypad_check_done(struct urb *urb, struct pt_regs *regs) #else static void keypad_check_done(struct urb *urb) @@ -429,7 +429,7 @@ static void wcusb_check_interrupt(struct wc_usb_pvt *p) } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)) #else static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb)) @@ -477,7 +477,7 @@ static int wcusb_async_read(struct wc_usb_pvt *p, unsigned char index, unsigned } #ifdef USB2420 -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static int wcusb_async_write(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb, struct pt_regs *regs)) #else static int wcusb_async_write(struct wc_usb_pvt *p, unsigned char index, unsigned char *data, int len, int state, void (*complete)(struct urb *urb)) @@ -883,7 +883,7 @@ static char wc_dtmf(struct wc_usb_pvt *p) return ZT_LIN2MU(linsample); } -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void wcusb_read_complete(struct urb *q, struct pt_regs *regs) #else static void wcusb_read_complete(struct urb *q) @@ -949,7 +949,7 @@ static void wcusb_read_complete(struct urb *q) return; } -#ifdef LINUX26 +#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) static void wcusb_write_complete(struct urb *q, struct pt_regs *regs) #else static void wcusb_write_complete(struct urb *q) |