summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/cdc_ether.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-02 21:43:40 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-02 22:02:06 -0700
commit7ef527377b88ff05fb122a47619ea506c631c914 (patch)
tree2c2e774527d5f591b975834f43e8c6fd12fb38f2 /drivers/net/usb/cdc_ether.c
parent47d29646a2c1c147d8a7598aeac2c87dd71ed638 (diff)
parent1183f3838c588545592c042c0ce15015661ce7f2 (diff)
downloadtalos-op-linux-7ef527377b88ff05fb122a47619ea506c631c914.tar.gz
talos-op-linux-7ef527377b88ff05fb122a47619ea506c631c914.zip
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.c1
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 = {
.bind = cdc_bind,
.unbind = usbnet_cdc_unbind,
.status = cdc_status,
+ .manage_power = cdc_manage_power,
};
/*-------------------------------------------------------------------------*/
OpenPOWER on IntegriCloud