diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:24:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:24:15 -0500 |
| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 (patch) | |
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 /drivers/usb/class/usbtmc.c | |
| parent | 8ae936690972dfcad73d0dde1095b9f32af5ee95 (diff) | |
| parent | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (diff) | |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
Diffstat (limited to 'drivers/usb/class/usbtmc.c')
| -rw-r--r-- | drivers/usb/class/usbtmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 8e74657f106c..43a863c5cc43 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
| @@ -51,6 +51,7 @@ static struct usb_device_id usbtmc_devices[] = { | |||
| 51 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, | 51 | { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, |
| 52 | { 0, } /* terminating entry */ | 52 | { 0, } /* terminating entry */ |
| 53 | }; | 53 | }; |
| 54 | MODULE_DEVICE_TABLE(usb, usbtmc_devices); | ||
| 54 | 55 | ||
| 55 | /* | 56 | /* |
| 56 | * This structure is the capabilities for the device | 57 | * This structure is the capabilities for the device |