diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 17:59:29 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 17:59:29 -0500 |
| commit | f1dccedc8148026d9071c6805f7cb77374a9e56f (patch) | |
| tree | ba4a630084b8d21309930321ff53a6ed4381c0f3 /drivers/usb/atm/usbatm.c | |
| parent | c943aa859c392eb4cc76d911daa1f261555075b2 (diff) | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/atm/usbatm.c')
| -rw-r--r-- | drivers/usb/atm/usbatm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 9baa6296fc95..7af1883d4bf9 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
| @@ -207,7 +207,7 @@ static inline void usbatm_pop(struct atm_vcc *vcc, struct sk_buff *skb) | |||
| 207 | ** urbs ** | 207 | ** urbs ** |
| 208 | ************/ | 208 | ************/ |
| 209 | 209 | ||
| 210 | static inline struct urb *usbatm_pop_urb(struct usbatm_channel *channel) | 210 | static struct urb *usbatm_pop_urb(struct usbatm_channel *channel) |
| 211 | { | 211 | { |
| 212 | struct urb *urb; | 212 | struct urb *urb; |
| 213 | 213 | ||
| @@ -224,7 +224,7 @@ static inline struct urb *usbatm_pop_urb(struct usbatm_channel *channel) | |||
| 224 | return urb; | 224 | return urb; |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | static inline int usbatm_submit_urb(struct urb *urb) | 227 | static int usbatm_submit_urb(struct urb *urb) |
| 228 | { | 228 | { |
| 229 | struct usbatm_channel *channel = urb->context; | 229 | struct usbatm_channel *channel = urb->context; |
| 230 | int ret; | 230 | int ret; |