The patch titled
drivers/video/sis/init.h: removal of old code
has been added to the -mm tree. Its filename is
drivers-video-sis-inith-removal-of-old-code.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drivers/video/sis/init.h: removal of old code
From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/sis/init.h | 7 -------
1 file changed, 7 deletions(-)
diff -puN drivers/video/sis/init.h~drivers-video-sis-inith-removal-of-old-code drivers/video/sis/init.h
--- a/drivers/video/sis/init.h~drivers-video-sis-inith-removal-of-old-code
+++ a/drivers/video/sis/init.h
@@ -77,16 +77,9 @@
#include <linux/types.h>
#include <asm/io.h>
#include <linux/fb.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#endif
#include "sis.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/sisfb.h>
-#else
#include <video/sisfb.h>
#endif
-#endif
/* Mode numbers */
static const unsigned short ModeIndex_320x200[] = {0x59, 0x41, 0x00, 0x4f};
_
Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are
csa-basic-accounting-over-taskstats-fix.patch
drivers-video-sis-init301h-removal-of-old.patch
drivers-video-sis-initextlfbc-removal-of.patch
drivers-video-sis-inith-removal-of-old-code.patch
drivers-video-sis-osdefh-removal-of-old-code.patch
drivers-video-sis-sis_accelc-removal-of-old.patch
drivers-video-sis-sis_accelh-removal-of-old.patch
drivers-video-sis-sis_mainc-removal-of-old.patch
drivers-video-sis-sis_mainh-removal-of-old.patch
drivers-video-sis-vgatypesh-removal-of-old.patch
fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-include-linux-configh.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
