diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 05:50:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 05:50:38 -0700 |
| commit | 50ee9339c7347c2b16fa79d43777f72e9f41ef5a (patch) | |
| tree | ce09aa147e5c8bb74c72c46cebfdbffeece6678f /drivers/usb/misc/ftdi-elan.c | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
| parent | 98346f7db014614a4814eb60639f651f8bbc591d (diff) | |
| download | linux-50ee9339c7347c2b16fa79d43777f72e9f41ef5a.tar.bz2 | |
Merge 2.6.39-rc4 into usb-next
This is needed to help resolve some xhci issues and other minor
differences.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc/ftdi-elan.c')
| -rw-r--r-- | drivers/usb/misc/ftdi-elan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index 7839c98fa742..b16bd3ce3915 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c @@ -2889,8 +2889,7 @@ static struct usb_driver ftdi_elan_driver = { static int __init ftdi_elan_init(void) { int result; - printk(KERN_INFO "driver %s built at %s on %s\n", ftdi_elan_driver.name, - __TIME__, __DATE__); + printk(KERN_INFO "driver %s\n", ftdi_elan_driver.name); mutex_init(&ftdi_module_lock); INIT_LIST_HEAD(&ftdi_static_list); status_queue = create_singlethread_workqueue("ftdi-status-control"); |