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
4938d3f4
Commit
4938d3f4
authored
Oct 18, 2006
by
Ben Collins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[controlfb] Ifdef for when CONFIG_NVRAM isn't enabled.
Signed-off-by:
Ben Collins
<
bcollins@ubuntu.com
>
parent
d57cdcff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
drivers/video/controlfb.c
drivers/video/controlfb.c
+6
-2
No files found.
drivers/video/controlfb.c
View file @
4938d3f4
...
...
@@ -415,13 +415,15 @@ static int __init init_control(struct fb_info_control *p)
full
=
p
->
total_vram
==
0x400000
;
/* Try to pick a video mode out of NVRAM if we have one. */
#ifdef CONFIG_NVRAM
if
(
default_cmode
==
CMODE_NVRAM
){
cmode
=
nvram_read_byte
(
NV_CMODE
);
if
(
cmode
<
CMODE_8
||
cmode
>
CMODE_32
)
cmode
=
CMODE_8
;
}
else
#endif
cmode
=
default_cmode
;
#ifdef CONFIG_NVRAM
if
(
default_vmode
==
VMODE_NVRAM
)
{
vmode
=
nvram_read_byte
(
NV_VMODE
);
if
(
vmode
<
1
||
vmode
>
VMODE_MAX
||
...
...
@@ -432,7 +434,9 @@ static int __init init_control(struct fb_info_control *p)
if
(
control_mac_modes
[
vmode
-
1
].
m
[
full
]
<
cmode
)
vmode
=
VMODE_640_480_60
;
}
}
else
{
}
else
#endif
{
vmode
=
default_vmode
;
if
(
control_mac_modes
[
vmode
-
1
].
m
[
full
]
<
cmode
)
{
if
(
cmode
>
CMODE_8
)
...
...
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