diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-03 00:43:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-03 01:02:06 -0400 |
| commit | 7ef527377b88ff05fb122a47619ea506c631c914 (patch) | |
| tree | 2c2e774527d5f591b975834f43e8c6fd12fb38f2 /drivers/net/usb/cdc_ether.c | |
| parent | 47d29646a2c1c147d8a7598aeac2c87dd71ed638 (diff) | |
| parent | 1183f3838c588545592c042c0ce15015661ce7f2 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 811b2dc423d1..b3fe0de40469 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -466,6 +466,7 @@ static const struct driver_info mbm_info = { | |||
| 466 | .bind = cdc_bind, | 466 | .bind = cdc_bind, |
| 467 | .unbind = usbnet_cdc_unbind, | 467 | .unbind = usbnet_cdc_unbind, |
| 468 | .status = cdc_status, | 468 | .status = cdc_status, |
| 469 | .manage_power = cdc_manage_power, | ||
| 469 | }; | 470 | }; |
| 470 | 471 | ||
| 471 | /*-------------------------------------------------------------------------*/ | 472 | /*-------------------------------------------------------------------------*/ |