- tgafb-actually-allocate-memory-for-the-pseudo_palette.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     tgafb: actually allocate memory for the pseudo_palette
has been removed from the -mm tree.  Its filename was
     tgafb-actually-allocate-memory-for-the-pseudo_palette.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: tgafb: actually allocate memory for the pseudo_palette
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>

No memory allocation was done for the pseudo_palette.  Allocate one for it.

Signed-off-by: Antonino Daplas <adaplas@xxxxxxxxx>
Acked-by: "Maciej W. Rozycki" <macro@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/video/tgafb.c |    2 +-
 include/video/tgafb.h |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/video/tgafb.c~tgafb-actually-allocate-memory-for-the-pseudo_palette drivers/video/tgafb.c
--- a/drivers/video/tgafb.c~tgafb-actually-allocate-memory-for-the-pseudo_palette
+++ a/drivers/video/tgafb.c
@@ -1634,7 +1634,7 @@ tgafb_register(struct device *dev)
 		      FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT;
 	info->fbops = &tgafb_ops;
 	info->screen_base = par->tga_fb_base;
-	info->pseudo_palette = (void *)(par + 1);
+	info->pseudo_palette = par->palette;
 
 	/* This should give a reasonable default video mode.  */
 	if (tga_bus_pci) {
diff -puN include/video/tgafb.h~tgafb-actually-allocate-memory-for-the-pseudo_palette include/video/tgafb.h
--- a/include/video/tgafb.h~tgafb-actually-allocate-memory-for-the-pseudo_palette
+++ a/include/video/tgafb.h
@@ -216,6 +216,7 @@ struct tga_par {
 	u32 pll_freq;			/* pixclock in mhz */
 	u32 bits_per_pixel;		/* bits per pixel */
 	u32 sync_on_green;		/* set if sync is on green */
+	u32 palette[16];
 };
 
 
_

Patches currently in -mm which might be from adaplas@xxxxxxxxx are

origin.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux