diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /drivers/usb/serial/cp2101.c | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'drivers/usb/serial/cp2101.c')
| -rw-r--r-- | drivers/usb/serial/cp2101.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c index 1279553381e3..8008d0bc80ad 100644 --- a/drivers/usb/serial/cp2101.c +++ b/drivers/usb/serial/cp2101.c | |||
| @@ -753,7 +753,8 @@ static int __init cp2101_init(void) | |||
| 753 | } | 753 | } |
| 754 | 754 | ||
| 755 | /* Success */ | 755 | /* Success */ |
| 756 | info(DRIVER_DESC " " DRIVER_VERSION); | 756 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
| 757 | DRIVER_DESC "\n"); | ||
| 757 | return 0; | 758 | return 0; |
| 758 | } | 759 | } |
| 759 | 760 | ||