The patch titled
arkfb: Fix compile error if CONFIG_MTRR=n
has been removed from the -mm tree. Its filename was
arkfb-fix-compile-error-if-config_mtrr=n.patch
This patch was dropped because it was folded into arkfb-new-framebuffer-driver-for-ark-logic-cards.patch
------------------------------------------------------
Subject: arkfb: Fix compile error if CONFIG_MTRR=n
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
Fix compile error if CONFIG_MTRR=n
Signed-off-by: Antonino Daplas <adaplas@xxxxxxxxx>
Acked-by: Ondrej Zajicek <santiago@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/arkfb.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff -puN drivers/video/arkfb.c~arkfb-fix-compile-error-if-config_mtrr=n drivers/video/arkfb.c
--- a/drivers/video/arkfb.c~arkfb-fix-compile-error-if-config_mtrr=n
+++ a/drivers/video/arkfb.c
@@ -1055,12 +1055,10 @@ err_enable_device:
static void __devexit ark_pci_remove(struct pci_dev *dev)
{
struct fb_info *info = pci_get_drvdata(dev);
+ struct arkfb_info *par = info->par;
if (info) {
-
#ifdef CONFIG_MTRR
- struct arkfb_info *par = info->par;
-
if (par->mtrr_reg >= 0) {
mtrr_del(par->mtrr_reg, 0, 0);
par->mtrr_reg = -1;
_
Patches currently in -mm which might be from adaplas@xxxxxxxxx are
origin.patch
vt8623fb-new-framebuffer-driver-for-via-vt8623.patch
arkfb-new-framebuffer-driver-for-ark-logic-cards.patch
arkfb-fix-compile-error-if-config_mtrr=n.patch
arkfb-new-framebuffer-driver-for-ark-logic-cards-fix.patch
svgalib-move-fb_get_caps-to-svgalib.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
