diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/media/video/video-buf-dvb.c | |
parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/video/video-buf-dvb.c')
-rw-r--r-- | drivers/media/video/video-buf-dvb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c index 55f129e964eb..0a4004a4393c 100644 --- a/drivers/media/video/video-buf-dvb.c +++ b/drivers/media/video/video-buf-dvb.c | |||
@@ -13,6 +13,7 @@ | |||
13 | * (at your option) any later version. | 13 | * (at your option) any later version. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | |||
16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
18 | #include <linux/device.h> | 19 | #include <linux/device.h> |
@@ -247,3 +248,4 @@ EXPORT_SYMBOL(videobuf_dvb_unregister); | |||
247 | * compile-command: "make DVB=1" | 248 | * compile-command: "make DVB=1" |
248 | * End: | 249 | * End: |
249 | */ | 250 | */ |
251 | |||