Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (890 commits)
  x86: fix nodemap_size according to nodeid bits
  x86: fix overlap between pagetable with bss section
  x86: add PCI IDs to k8topology_64.c
  x86: fix early_ioremap pagetable ops
  x86: use the same pgd_list for PAE and 64-bit
  x86: defer cr3 reload when doing pud_clear()
  x86: early boot debugging via FireWire (ohci1394_dma=early)
  x86: don't special-case pmd allocations as much
  x86: shrink some ifdefs in fault.c
  x86: ignore spurious faults
  x86: remove nx_enabled from fault.c
  x86: unify fault_32|64.c
  x86: unify fault_32|64.c with ifdefs
  x86: unify fault_32|64.c by ifdef'd function bodies
  x86: arch/x86/mm/init_32.c printk fixes
  x86: arch/x86/mm/init_32.c cleanup
  x86: arch/x86/mm/init_64.c printk fixes
  x86: unify ioremap
  x86: fixes some bugs about EFI memory map handling
  x86: use reboot_type on EFI 32
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c
index aef02f9ec0c1..7259387b7d19 100644
--- a/arch/x86/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
@@ -18,22 +18,22 @@
 #include "video.h"
 
 static struct mode_info vga_modes[] = {
-        { VIDEO_80x25,  80, 25 },
-        { VIDEO_8POINT, 80, 50 },
-        { VIDEO_80x43,  80, 43 },
-        { VIDEO_80x28,  80, 28 },
-        { VIDEO_80x30,  80, 30 },
-        { VIDEO_80x34,  80, 34 },
-        { VIDEO_80x60,  80, 60 },
+        { VIDEO_80x25,  80, 25, 0 },
+        { VIDEO_8POINT, 80, 50, 0 },
+        { VIDEO_80x43,  80, 43, 0 },
+        { VIDEO_80x28,  80, 28, 0 },
+        { VIDEO_80x30,  80, 30, 0 },
+        { VIDEO_80x34,  80, 34, 0 },
+        { VIDEO_80x60,  80, 60, 0 },
 };
 
 static struct mode_info ega_modes[] = {
-        { VIDEO_80x25,  80, 25 },
-        { VIDEO_8POINT, 80, 43 },
+        { VIDEO_80x25,  80, 25, 0 },
+        { VIDEO_8POINT, 80, 43, 0 },
 };
 
 static struct mode_info cga_modes[] = {
-        { VIDEO_80x25,  80, 25 },
+        { VIDEO_80x25,  80, 25, 0 },
 };
 
 __videocard video_vga;