projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-33' of git://repo.or.cz/linux-kbuild
[linux-2.6-block.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-empress.c
diff --git
a/drivers/media/video/saa7134/saa7134-empress.c
b/drivers/media/video/saa7134/saa7134-empress.c
index df56241b30a4728649780d4ad42ba8d9d414541c..7dfecfc6017cab0db7d0bea4c979e783fc4ec13d 100644
(file)
--- a/
drivers/media/video/saa7134/saa7134-empress.c
+++ b/
drivers/media/video/saa7134/saa7134-empress.c
@@
-481,7
+481,6
@@
static const struct v4l2_ioctl_ops ts_ioctl_ops = {
static struct video_device saa7134_empress_template = {
.name = "saa7134-empress",
.fops = &ts_fops,
- .minor = -1,
.ioctl_ops = &ts_ioctl_ops,
.tvnorms = SAA7134_NORMS,