diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
| commit | 25d3f1622fdbc73db3f6860961b5fb3035a39f32 (patch) | |
| tree | f4eef88bc0083f282c64c14e81c0ecc95e5f2b43 /drivers/media/video/video-buf-dvb.c | |
| parent | dc3edd5412341b02d84144ddfd5bf6ccaaeeb1ac (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 | |||