The patch titled
au1100fb-add-power-management-support-tidy
has been removed from the -mm tree. Its filename is
au1100fb-add-power-management-support-tidy.patch
This patch was dropped because it was folded into au1100fb-add-power-management-support.patch
------------------------------------------------------
Subject: au1100fb-add-power-management-support-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Do it the usual way.
Cc: Rodolfo Giometti <giometti@xxxxxxxx>
Cc: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/au1100fb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/video/au1100fb.c~au1100fb-add-power-management-support-tidy drivers/video/au1100fb.c
--- devel/drivers/video/au1100fb.c~au1100fb-add-power-management-support-tidy 2006-05-29 15:58:42.000000000 -0700
+++ devel-akpm/drivers/video/au1100fb.c 2006-05-29 15:58:42.000000000 -0700
@@ -646,6 +646,9 @@ int au1100fb_drv_resume(struct device *d
return 0;
}
+#else
+#define au1100fb_drv_suspend NULL
+#define au1100fb_drv_resume NULL
#endif
static struct device_driver au1100fb_driver = {
@@ -654,10 +657,8 @@ static struct device_driver au1100fb_dri
.probe = au1100fb_drv_probe,
.remove = au1100fb_drv_remove,
-#ifdef CONFIG_PM
.suspend = au1100fb_drv_suspend,
.resume = au1100fb_drv_resume,
-#endif
};
/*-------------------------------------------------------------------------*/
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
hangcheck-remove-monotomic_clock-on-x86.patch
savagefb-add-state-save-and_restore-hooks.patch
au1100fb-add-power-management-support.patch
au1100fb-add-power-management-support-tidy.patch
imacfb-add-intel-based-macintosh-framebuffer-support-tidy.patch
vt-binding-add-sysfs-control-to-the-vt-layer-fix.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-rename-desc-handler-to-desc-chip-terminate_irqs-fix.patch
genirq-ia64-build-fix.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
