diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /drivers/media/video/dabusb.c | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'drivers/media/video/dabusb.c')
| -rw-r--r-- | drivers/media/video/dabusb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 79faedf58521..3aa538afcc0b 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
| @@ -866,7 +866,8 @@ static int __init dabusb_init (void) | |||
| 866 | 866 | ||
| 867 | dbg("dabusb_init: driver registered"); | 867 | dbg("dabusb_init: driver registered"); |
| 868 | 868 | ||
| 869 | info(DRIVER_VERSION ":" DRIVER_DESC); | 869 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
| 870 | DRIVER_DESC "\n"); | ||
| 870 | 871 | ||
| 871 | out: | 872 | out: |
| 872 | return retval; | 873 | return retval; |