diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:28:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:28:31 +0100 |
| commit | b366801c95bdbeda811ac9668a3943051a18c188 (patch) | |
| tree | 79f08da2ad33a3159e67df344a4c411c88da7db6 /drivers/usb/serial/oti6858.c | |
| parent | eff9073790e1286aa12bf1c65814d3e0132b12e1 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
Merge commit 'v2.6.38-rc4' into x86/numa
Merge reason: Merge latest fixes before applying new patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/oti6858.c')
| -rw-r--r-- | drivers/usb/serial/oti6858.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 5be866bb7a4..73613205be7 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c @@ -157,6 +157,7 @@ static struct usb_serial_driver oti6858_device = { .name = "oti6858", }, .id_table = id_table, + .usb_driver = &oti6858_driver, .num_ports = 1, .open = oti6858_open, .close = oti6858_close, |