diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
| commit | 96b88fb850cc419171f926ad04650ec509e9f543 (patch) | |
| tree | 5bf9537bde467534608b3acdbfa5f7726ede8c3f /drivers/usb/net/zaurus.c | |
| parent | e78a57de94480226f7fc90d0b4837bfc6c99a9e0 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/net/zaurus.c')
| -rw-r--r-- | drivers/usb/net/zaurus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c index ee3b892aeabc..5d4b7d55b097 100644 --- a/drivers/usb/net/zaurus.c +++ b/drivers/usb/net/zaurus.c | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | */ | 62 | */ |
| 63 | 63 | ||
| 64 | static struct sk_buff * | 64 | static struct sk_buff * |
| 65 | zaurus_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags) | 65 | zaurus_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) |
| 66 | { | 66 | { |
| 67 | int padlen; | 67 | int padlen; |
| 68 | struct sk_buff *skb2; | 68 | struct sk_buff *skb2; |