diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
| commit | 1540c84b5ed657ed71dce06915bba461e6b09574 (patch) | |
| tree | a449dc166800a1b0c429bb038bfc974e577eaf72 /drivers/net/usb/cdc_ether.c | |
| parent | 1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff) | |
| parent | 4640b4e7d9919e9629fe8456df94f71658431ef9 (diff) | |
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 5f3b9eaeb04f..8a6e02736324 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -433,6 +433,7 @@ static const struct driver_info mbm_info = { | |||
| 433 | .bind = cdc_bind, | 433 | .bind = cdc_bind, |
| 434 | .unbind = usbnet_cdc_unbind, | 434 | .unbind = usbnet_cdc_unbind, |
| 435 | .status = cdc_status, | 435 | .status = cdc_status, |
| 436 | .manage_power = cdc_manage_power, | ||
| 436 | }; | 437 | }; |
| 437 | 438 | ||
| 438 | /*-------------------------------------------------------------------------*/ | 439 | /*-------------------------------------------------------------------------*/ |