diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-05-02 21:43:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-02 22:02:06 -0700 |
| commit | 7ef527377b88ff05fb122a47619ea506c631c914 (patch) | |
| tree | 2c2e774527d5f591b975834f43e8c6fd12fb38f2 /drivers/net/usb/cdc_ether.c | |
| parent | net: Inline skb_pull() in eth_type_trans(). (diff) | |
| parent | net: fix compile error due to double return type in SOCK_DEBUG (diff) | |
| download | wireguard-linux-7ef527377b88ff05fb122a47619ea506c631c914.tar.xz wireguard-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.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 = { .bind = cdc_bind, .unbind = usbnet_cdc_unbind, .status = cdc_status, + .manage_power = cdc_manage_power, }; /*-------------------------------------------------------------------------*/ |