diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/video/dabusb.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/video/dabusb.c')
| -rw-r--r-- | drivers/media/video/dabusb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index ee43876adb06..9b413a35e048 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
| @@ -913,6 +913,8 @@ static void __exit dabusb_cleanup (void) | |||
| 913 | MODULE_AUTHOR( DRIVER_AUTHOR ); | 913 | MODULE_AUTHOR( DRIVER_AUTHOR ); |
| 914 | MODULE_DESCRIPTION( DRIVER_DESC ); | 914 | MODULE_DESCRIPTION( DRIVER_DESC ); |
| 915 | MODULE_LICENSE("GPL"); | 915 | MODULE_LICENSE("GPL"); |
| 916 | MODULE_FIRMWARE("dabusb/firmware.fw"); | ||
| 917 | MODULE_FIRMWARE("dabusb/bitstream.bin"); | ||
| 916 | 918 | ||
| 917 | module_param(buffers, int, 0); | 919 | module_param(buffers, int, 0); |
| 918 | MODULE_PARM_DESC (buffers, "Number of buffers (default=256)"); | 920 | MODULE_PARM_DESC (buffers, "Number of buffers (default=256)"); |