Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
b0c4be8c
Commit
b0c4be8c
authored
Dec 30, 2008
by
Mauro Carvalho Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board
Signed-off-by:
Mauro Carvalho Chehab
<
mchehab@redhat.com
>
parent
47aeba5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
drivers/media/video/saa7134/saa7134-dvb.c
drivers/media/video/saa7134/saa7134-dvb.c
+3
-3
No files found.
drivers/media/video/saa7134/saa7134-dvb.c
View file @
b0c4be8c
...
...
@@ -1366,11 +1366,11 @@ static int dvb_init(struct saa7134_dev *dev)
goto
dettach_frontend
;
break
;
case
SAA7134_BOARD_BEHOLD_H6
:
dev
->
dvb
.
frontend
=
dvb_attach
(
zl10353_attach
,
fe0
->
dvb
.
frontend
=
dvb_attach
(
zl10353_attach
,
&
behold_h6_config
,
&
dev
->
i2c_adap
);
if
(
dev
->
dvb
.
frontend
)
{
dvb_attach
(
simple_tuner_attach
,
dev
->
dvb
.
frontend
,
if
(
fe0
->
dvb
.
frontend
)
{
dvb_attach
(
simple_tuner_attach
,
fe0
->
dvb
.
frontend
,
&
dev
->
i2c_adap
,
0x61
,
TUNER_PHILIPS_FMD1216ME_MK3
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment