summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/video-vga.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
commitd028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch)
tree6bd73a5c70b407491dc9d40ecb9e95b48233d004 /arch/x86/boot/video-vga.c
parentMerge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
parentx86: build fix for "x86: fix C1E && nx6325 stability problem" (diff)
downloadlinux-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.tar.xz
linux-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.zip
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'arch/x86/boot/video-vga.c')
-rw-r--r--arch/x86/boot/video-vga.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c
index 40ecb8d7688c..b939cb476dec 100644
--- a/arch/x86/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
@@ -259,8 +259,7 @@ static int vga_probe(void)
return mode_count[adapter];
}
-__videocard video_vga =
-{
+__videocard video_vga = {
.card_name = "VGA",
.probe = vga_probe,
.set_mode = vga_set_mode,