git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
stradis.c
diff --git
a/drivers/media/video/stradis.c
b/drivers/media/video/stradis.c
index eb220461ac77a8e9f973dae81f837ee4ae54a198..3fb85af5d1f2b8ab45140661298a53062c920fb3 100644
(file)
--- a/
drivers/media/video/stradis.c
+++ b/
drivers/media/video/stradis.c
@@
-1917,7
+1917,6
@@
static const struct file_operations saa_fops = {
static struct video_device saa_template = {
.name = "SAA7146A",
.type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
- .hardware = VID_HARDWARE_SAA7146,
.fops = &saa_fops,
.minor = -1,
};