diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
commit | 470fba7ebe60ad9185056b080b331abad24b4df9 (patch) | |
tree | f83bc13d97adaf5dd0e0f1d6a157b890f868577f /drivers/media/video/cpia.c | |
parent | documentation: move mtrr.txt to Doc/x86/ subdir (diff) | |
parent | Linux v2.6.27-rc4 (diff) | |
download | linux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz linux-470fba7ebe60ad9185056b080b331abad24b4df9.zip |
Merge branch 'linus' into x86/doc
Diffstat (limited to 'drivers/media/video/cpia.c')
-rw-r--r-- | drivers/media/video/cpia.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index 2a81376ef503..dc8cc6115e2f 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c @@ -3799,9 +3799,7 @@ static const struct file_operations cpia_fops = { }; static struct video_device cpia_template = { - .owner = THIS_MODULE, .name = "CPiA Camera", - .type = VID_TYPE_CAPTURE, .fops = &cpia_fops, }; |