diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:43 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:47 -0400 |
| commit | aff364860aa105b2deacc6f21ec8ef524460e3fc (patch) | |
| tree | 18409ebe16b25b141598da9b6386d69416c06afa /drivers/net/usb/net1080.c | |
| parent | c7a7b814c9dca9ee01b38e63b4a46de87156d3b6 (diff) | |
| parent | 993ba1585cbb03fab012e41d1a5d24330a283b31 (diff) | |
Merge branch 'x86/numa' into x86-mm
Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab541^..993ba1585c.
3fe14ab541: x86-32, numa: Fix failure condition check in alloc_remap()
993ba1585c: x86-32, numa: Update remap allocator comments
Scheduled NUMA init 32/64bit unification changes depend on them.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/net/usb/net1080.c')
| -rw-r--r-- | drivers/net/usb/net1080.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c index ba72a7281cb..01db4602a39 100644 --- a/drivers/net/usb/net1080.c +++ b/drivers/net/usb/net1080.c | |||
| @@ -560,7 +560,7 @@ static int net1080_bind(struct usbnet *dev, struct usb_interface *intf) | |||
| 560 | 560 | ||
| 561 | static const struct driver_info net1080_info = { | 561 | static const struct driver_info net1080_info = { |
| 562 | .description = "NetChip TurboCONNECT", | 562 | .description = "NetChip TurboCONNECT", |
| 563 | .flags = FLAG_FRAMING_NC, | 563 | .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_NC, |
| 564 | .bind = net1080_bind, | 564 | .bind = net1080_bind, |
| 565 | .reset = net1080_reset, | 565 | .reset = net1080_reset, |
| 566 | .check_connect = net1080_check_connect, | 566 | .check_connect = net1080_check_connect, |