diff for duplicates of <20060406103427.GC28056@flint.arm.linux.org.uk> diff --git a/a/1.txt b/N1/1.txt index b7e512e..9a05837 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,8 @@ diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -391,7 +391,7 @@ static const char __init *vgacon_startup - static struct resource ega_console_resource { .name = "ega", .start = 0x3B0, .end = 0x3BF }; + static struct resource ega_console_resource = + { .name = "ega", .start = 0x3B0, .end = 0x3BF }; vga_video_type = VIDEO_TYPE_EGAM; - vga_vram_end = 0xb8000; + vga_vram_size = 0x8000; @@ -41,7 +42,8 @@ diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c request_resource(&ioport_resource, &ega_console_resource); @@ -401,7 +401,7 @@ static const char __init *vgacon_startup - static struct resource mda2_console_resource { .name = "mda", .start = 0x3BF, .end = 0x3BF }; + static struct resource mda2_console_resource = + { .name = "mda", .start = 0x3BF, .end = 0x3BF }; vga_video_type = VIDEO_TYPE_MDA; - vga_vram_end = 0xb2000; + vga_vram_size = 0x2000; @@ -67,7 +69,8 @@ diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c outb_p(6, VGA_GFX_D); #endif @@ -475,7 +475,7 @@ static const char __init *vgacon_startup - static struct resource cga_console_resource { .name = "cga", .start = 0x3D4, .end = 0x3D5 }; + static struct resource cga_console_resource = + { .name = "cga", .start = 0x3D4, .end = 0x3D5 }; vga_video_type = VIDEO_TYPE_CGA; - vga_vram_end = 0xba000; + vga_vram_size = 0x2000; @@ -94,7 +97,7 @@ diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c + charmap = (char *) VGA_MAP_MEM(colourmap, 8 * cmapsz); beg = 0x0e; #ifdef VGA_CAN_DO_64KB - if (vga_video_type = VIDEO_TYPE_VGAC) + if (vga_video_type == VIDEO_TYPE_VGAC) beg = 0x06; #endif } else { @@ -113,7 +116,8 @@ diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c /* First, the sequencer, Synchronous reset */ vga_wseq(state->vgabase, VGA_SEQ_RESET, 0x01); Index: work-mm5/include/asm-alpha/vga.h -=================================--- work-mm5.orig/include/asm-alpha/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-alpha/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-alpha/vga.h 2006-04-05 15:42:35.000000000 -0600 @@ -46,6 +46,7 @@ #define vga_readb(a) readb((u8 __iomem *)(a)) @@ -125,7 +129,8 @@ Index: work-mm5/include/asm-alpha/vga.h #endif Index: work-mm5/include/asm-arm/vga.h -=================================--- work-mm5.orig/include/asm-arm/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-arm/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-arm/vga.h 2006-04-05 15:42:21.000000000 -0600 @@ -4,7 +4,8 @@ #include <asm/hardware.h> @@ -138,7 +143,8 @@ Index: work-mm5/include/asm-arm/vga.h #define vga_readb(x) (*((volatile unsigned char *)x)) #define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x)) Index: work-mm5/include/asm-i386/vga.h -=================================--- work-mm5.orig/include/asm-i386/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-i386/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-i386/vga.h 2006-04-05 15:42:49.000000000 -0600 @@ -12,7 +12,8 @@ * access the videoram directly without any black magic. @@ -151,7 +157,8 @@ Index: work-mm5/include/asm-i386/vga.h #define vga_readb(x) (*(x)) #define vga_writeb(x,y) (*(y) = (x)) Index: work-mm5/include/asm-ia64/vga.h -=================================--- work-mm5.orig/include/asm-ia64/vga.h 2006-04-05 09:57:55.000000000 -0600 +=================================================================== +--- work-mm5.orig/include/asm-ia64/vga.h 2006-04-05 09:57:55.000000000 -0600 +++ work-mm5/include/asm-ia64/vga.h 2006-04-05 15:43:09.000000000 -0600 @@ -17,7 +17,8 @@ extern unsigned long vga_console_iobase; @@ -164,7 +171,8 @@ Index: work-mm5/include/asm-ia64/vga.h #define vga_readb(x) (*(x)) #define vga_writeb(x,y) (*(y) = (x)) Index: work-mm5/include/asm-m32r/vga.h -=================================--- work-mm5.orig/include/asm-m32r/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-m32r/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-m32r/vga.h 2006-04-05 15:43:22.000000000 -0600 @@ -14,7 +14,8 @@ * access the videoram directly without any black magic. @@ -177,7 +185,8 @@ Index: work-mm5/include/asm-m32r/vga.h #define vga_readb(x) (*(x)) #define vga_writeb(x,y) (*(y) = (x)) Index: work-mm5/include/asm-mips/vga.h -=================================--- work-mm5.orig/include/asm-mips/vga.h 2006-03-23 10:22:17.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-mips/vga.h 2006-03-23 10:22:17.000000000 -0700 +++ work-mm5/include/asm-mips/vga.h 2006-04-05 15:43:32.000000000 -0600 @@ -13,7 +13,8 @@ * access the videoram directly without any black magic. @@ -190,7 +199,8 @@ Index: work-mm5/include/asm-mips/vga.h #define vga_readb(x) (*(x)) #define vga_writeb(x,y) (*(y) = (x)) Index: work-mm5/include/asm-powerpc/vga.h -=================================--- work-mm5.orig/include/asm-powerpc/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-powerpc/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-powerpc/vga.h 2006-04-05 15:43:57.000000000 -0600 @@ -42,9 +42,11 @@ extern unsigned long vgacon_remap_base; @@ -207,7 +217,8 @@ Index: work-mm5/include/asm-powerpc/vga.h #define vga_readb(x) (*(x)) Index: work-mm5/include/asm-sparc64/vga.h -=================================--- work-mm5.orig/include/asm-sparc64/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-sparc64/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-sparc64/vga.h 2006-04-05 15:44:08.000000000 -0600 @@ -28,6 +28,7 @@ return *addr; @@ -219,7 +230,8 @@ Index: work-mm5/include/asm-sparc64/vga.h #endif Index: work-mm5/include/asm-x86_64/vga.h -=================================--- work-mm5.orig/include/asm-x86_64/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-x86_64/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-x86_64/vga.h 2006-04-05 15:44:18.000000000 -0600 @@ -12,7 +12,8 @@ * access the videoram directly without any black magic. @@ -232,7 +244,8 @@ Index: work-mm5/include/asm-x86_64/vga.h #define vga_readb(x) (*(x)) #define vga_writeb(x,y) (*(y) = (x)) Index: work-mm5/include/asm-xtensa/vga.h -=================================--- work-mm5.orig/include/asm-xtensa/vga.h 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/include/asm-xtensa/vga.h 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/include/asm-xtensa/vga.h 2006-04-05 15:44:31.000000000 -0600 @@ -11,7 +11,8 @@ #ifndef _XTENSA_VGA_H @@ -245,7 +258,8 @@ Index: work-mm5/include/asm-xtensa/vga.h #define vga_readb(x) (*(x)) #define vga_writeb(x,y) (*(y) = (x)) Index: work-mm5/drivers/video/console/mdacon.c -=================================--- work-mm5.orig/drivers/video/console/mdacon.c 2006-01-02 20:21:10.000000000 -0700 +=================================================================== +--- work-mm5.orig/drivers/video/console/mdacon.c 2006-01-02 20:21:10.000000000 -0700 +++ work-mm5/drivers/video/console/mdacon.c 2006-04-05 15:46:33.000000000 -0600 @@ -313,8 +313,8 @@ mda_num_columns = 80; @@ -258,7 +272,8 @@ Index: work-mm5/drivers/video/console/mdacon.c mda_index_port = 0x3b4; mda_value_port = 0x3b5; Index: work-mm5/drivers/video/vga16fb.c -=================================--- work-mm5.orig/drivers/video/vga16fb.c 2006-03-23 10:22:16.000000000 -0700 +=================================================================== +--- work-mm5.orig/drivers/video/vga16fb.c 2006-03-23 10:22:16.000000000 -0700 +++ work-mm5/drivers/video/vga16fb.c 2006-04-05 15:49:34.000000000 -0600 @@ -1351,7 +1351,7 @@ } diff --git a/a/content_digest b/N1/content_digest index d273a4d..59a3c7f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\020060406102154.GB28056@flint.arm.linux.org.uk\0" "From\0Russell King <rmk+lkml@arm.linux.org.uk>\0" "Subject\0Re: 2.6.17-rc1-mm1\0" - "Date\0Thu, 06 Apr 2006 10:34:27 +0000\0" + "Date\0Thu, 6 Apr 2006 11:34:27 +0100\0" "To\0Bjorn Helgaas <bjorn.helgaas@hp.com>" Luck Tony <tony.luck@intel.com> @@ -50,7 +50,8 @@ "--- a/drivers/video/console/vgacon.c\n" "+++ b/drivers/video/console/vgacon.c\n" "@@ -391,7 +391,7 @@ static const char __init *vgacon_startup\n" - " \t\t\tstatic struct resource ega_console_resource \t\t\t { .name = \"ega\", .start = 0x3B0, .end = 0x3BF };\n" + " \t\t\tstatic struct resource ega_console_resource =\n" + " \t\t\t { .name = \"ega\", .start = 0x3B0, .end = 0x3BF };\n" " \t\t\tvga_video_type = VIDEO_TYPE_EGAM;\n" "-\t\t\tvga_vram_end = 0xb8000;\n" "+\t\t\tvga_vram_size = 0x8000;\n" @@ -58,7 +59,8 @@ " \t\t\trequest_resource(&ioport_resource,\n" " \t\t\t\t\t &ega_console_resource);\n" "@@ -401,7 +401,7 @@ static const char __init *vgacon_startup\n" - " \t\t\tstatic struct resource mda2_console_resource \t\t\t { .name = \"mda\", .start = 0x3BF, .end = 0x3BF };\n" + " \t\t\tstatic struct resource mda2_console_resource =\n" + " \t\t\t { .name = \"mda\", .start = 0x3BF, .end = 0x3BF };\n" " \t\t\tvga_video_type = VIDEO_TYPE_MDA;\n" "-\t\t\tvga_vram_end = 0xb2000;\n" "+\t\t\tvga_vram_size = 0x2000;\n" @@ -84,7 +86,8 @@ " \t\t\t\toutb_p(6, VGA_GFX_D);\n" " #endif\n" "@@ -475,7 +475,7 @@ static const char __init *vgacon_startup\n" - " \t\t\tstatic struct resource cga_console_resource \t\t\t { .name = \"cga\", .start = 0x3D4, .end = 0x3D5 };\n" + " \t\t\tstatic struct resource cga_console_resource =\n" + " \t\t\t { .name = \"cga\", .start = 0x3D4, .end = 0x3D5 };\n" " \t\t\tvga_video_type = VIDEO_TYPE_CGA;\n" "-\t\t\tvga_vram_end = 0xba000;\n" "+\t\t\tvga_vram_size = 0x2000;\n" @@ -111,7 +114,7 @@ "+\t\tcharmap = (char *) VGA_MAP_MEM(colourmap, 8 * cmapsz);\n" " \t\tbeg = 0x0e;\n" " #ifdef VGA_CAN_DO_64KB\n" - " \t\tif (vga_video_type = VIDEO_TYPE_VGAC)\n" + " \t\tif (vga_video_type == VIDEO_TYPE_VGAC)\n" " \t\t\tbeg = 0x06;\n" " #endif\n" " \t} else {\n" @@ -130,7 +133,8 @@ " \t/* First, the sequencer, Synchronous reset */\n" " \tvga_wseq(state->vgabase, VGA_SEQ_RESET, 0x01);\t\n" "Index: work-mm5/include/asm-alpha/vga.h\n" - "=================================--- work-mm5.orig/include/asm-alpha/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-alpha/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-alpha/vga.h\t2006-04-05 15:42:35.000000000 -0600\n" "@@ -46,6 +46,7 @@\n" " #define vga_readb(a)\treadb((u8 __iomem *)(a))\n" @@ -142,7 +146,8 @@ " \n" " #endif\n" "Index: work-mm5/include/asm-arm/vga.h\n" - "=================================--- work-mm5.orig/include/asm-arm/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-arm/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-arm/vga.h\t2006-04-05 15:42:21.000000000 -0600\n" "@@ -4,7 +4,8 @@\n" " #include <asm/hardware.h>\n" @@ -155,7 +160,8 @@ " #define vga_readb(x)\t(*((volatile unsigned char *)x))\n" " #define vga_writeb(x,y)\t(*((volatile unsigned char *)y) = (x))\n" "Index: work-mm5/include/asm-i386/vga.h\n" - "=================================--- work-mm5.orig/include/asm-i386/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-i386/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-i386/vga.h\t2006-04-05 15:42:49.000000000 -0600\n" "@@ -12,7 +12,8 @@\n" " *\taccess the videoram directly without any black magic.\n" @@ -168,7 +174,8 @@ " #define vga_readb(x) (*(x))\n" " #define vga_writeb(x,y) (*(y) = (x))\n" "Index: work-mm5/include/asm-ia64/vga.h\n" - "=================================--- work-mm5.orig/include/asm-ia64/vga.h\t2006-04-05 09:57:55.000000000 -0600\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-ia64/vga.h\t2006-04-05 09:57:55.000000000 -0600\n" "+++ work-mm5/include/asm-ia64/vga.h\t2006-04-05 15:43:09.000000000 -0600\n" "@@ -17,7 +17,8 @@\n" " extern unsigned long vga_console_iobase;\n" @@ -181,7 +188,8 @@ " #define vga_readb(x)\t(*(x))\n" " #define vga_writeb(x,y)\t(*(y) = (x))\n" "Index: work-mm5/include/asm-m32r/vga.h\n" - "=================================--- work-mm5.orig/include/asm-m32r/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-m32r/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-m32r/vga.h\t2006-04-05 15:43:22.000000000 -0600\n" "@@ -14,7 +14,8 @@\n" " *\taccess the videoram directly without any black magic.\n" @@ -194,7 +202,8 @@ " #define vga_readb(x) (*(x))\n" " #define vga_writeb(x,y) (*(y) = (x))\n" "Index: work-mm5/include/asm-mips/vga.h\n" - "=================================--- work-mm5.orig/include/asm-mips/vga.h\t2006-03-23 10:22:17.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-mips/vga.h\t2006-03-23 10:22:17.000000000 -0700\n" "+++ work-mm5/include/asm-mips/vga.h\t2006-04-05 15:43:32.000000000 -0600\n" "@@ -13,7 +13,8 @@\n" " *\taccess the videoram directly without any black magic.\n" @@ -207,7 +216,8 @@ " #define vga_readb(x)\t(*(x))\n" " #define vga_writeb(x,y)\t(*(y) = (x))\n" "Index: work-mm5/include/asm-powerpc/vga.h\n" - "=================================--- work-mm5.orig/include/asm-powerpc/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-powerpc/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-powerpc/vga.h\t2006-04-05 15:43:57.000000000 -0600\n" "@@ -42,9 +42,11 @@\n" " extern unsigned long vgacon_remap_base;\n" @@ -224,7 +234,8 @@ " \n" " #define vga_readb(x) (*(x))\n" "Index: work-mm5/include/asm-sparc64/vga.h\n" - "=================================--- work-mm5.orig/include/asm-sparc64/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-sparc64/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-sparc64/vga.h\t2006-04-05 15:44:08.000000000 -0600\n" "@@ -28,6 +28,7 @@\n" " \treturn *addr;\n" @@ -236,7 +247,8 @@ " \n" " #endif\n" "Index: work-mm5/include/asm-x86_64/vga.h\n" - "=================================--- work-mm5.orig/include/asm-x86_64/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-x86_64/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-x86_64/vga.h\t2006-04-05 15:44:18.000000000 -0600\n" "@@ -12,7 +12,8 @@\n" " *\taccess the videoram directly without any black magic.\n" @@ -249,7 +261,8 @@ " #define vga_readb(x) (*(x))\n" " #define vga_writeb(x,y) (*(y) = (x))\n" "Index: work-mm5/include/asm-xtensa/vga.h\n" - "=================================--- work-mm5.orig/include/asm-xtensa/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/include/asm-xtensa/vga.h\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/include/asm-xtensa/vga.h\t2006-04-05 15:44:31.000000000 -0600\n" "@@ -11,7 +11,8 @@\n" " #ifndef _XTENSA_VGA_H\n" @@ -262,7 +275,8 @@ " #define vga_readb(x)\t(*(x))\n" " #define vga_writeb(x,y)\t(*(y) = (x))\n" "Index: work-mm5/drivers/video/console/mdacon.c\n" - "=================================--- work-mm5.orig/drivers/video/console/mdacon.c\t2006-01-02 20:21:10.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/drivers/video/console/mdacon.c\t2006-01-02 20:21:10.000000000 -0700\n" "+++ work-mm5/drivers/video/console/mdacon.c\t2006-04-05 15:46:33.000000000 -0600\n" "@@ -313,8 +313,8 @@\n" " \tmda_num_columns = 80;\n" @@ -275,7 +289,8 @@ " \tmda_index_port = 0x3b4;\n" " \tmda_value_port = 0x3b5;\n" "Index: work-mm5/drivers/video/vga16fb.c\n" - "=================================--- work-mm5.orig/drivers/video/vga16fb.c\t2006-03-23 10:22:16.000000000 -0700\n" + "===================================================================\n" + "--- work-mm5.orig/drivers/video/vga16fb.c\t2006-03-23 10:22:16.000000000 -0700\n" "+++ work-mm5/drivers/video/vga16fb.c\t2006-04-05 15:49:34.000000000 -0600\n" "@@ -1351,7 +1351,7 @@\n" " \t}\n" @@ -292,4 +307,4 @@ " Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/\n" maintainer of: 2.6 Serial core -a24867aabf89450e42d68e3b0c6a0b811b154d8f862b279b9ed122894197ee3f +4e30c10e9d74ad48653b574b5386d717ce9b1ce350f6bf652194d51bebfadbf7
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.