Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
996f3247
Commit
996f3247
authored
Oct 18, 2006
by
Ben Collins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.
Signed-off-by:
Ben Collins
<
bcollins@ubuntu.com
>
parent
f3f6f9aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
drivers/video/valkyriefb.c
drivers/video/valkyriefb.c
+2
-2
No files found.
drivers/video/valkyriefb.c
View file @
996f3247
...
@@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
...
@@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
printk
(
KERN_INFO
"Monitor sense value = 0x%x
\n
"
,
p
->
sense
);
printk
(
KERN_INFO
"Monitor sense value = 0x%x
\n
"
,
p
->
sense
);
/* Try to pick a video mode out of NVRAM if we have one. */
/* Try to pick a video mode out of NVRAM if we have one. */
#if
ndef CONFIG_MAC
#if
!defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
if
(
default_vmode
==
VMODE_NVRAM
)
{
if
(
default_vmode
==
VMODE_NVRAM
)
{
default_vmode
=
nvram_read_byte
(
NV_VMODE
);
default_vmode
=
nvram_read_byte
(
NV_VMODE
);
if
(
default_vmode
<=
0
if
(
default_vmode
<=
0
...
@@ -297,7 +297,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
...
@@ -297,7 +297,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
default_vmode
=
mac_map_monitor_sense
(
p
->
sense
);
default_vmode
=
mac_map_monitor_sense
(
p
->
sense
);
if
(
!
valkyrie_reg_init
[
default_vmode
-
1
])
if
(
!
valkyrie_reg_init
[
default_vmode
-
1
])
default_vmode
=
VMODE_640_480_67
;
default_vmode
=
VMODE_640_480_67
;
#if
ndef CONFIG_MAC
#if
!defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
if
(
default_cmode
==
CMODE_NVRAM
)
if
(
default_cmode
==
CMODE_NVRAM
)
default_cmode
=
nvram_read_byte
(
NV_CMODE
);
default_cmode
=
nvram_read_byte
(
NV_CMODE
);
#endif
#endif
...
...
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