The patch titled
drivers/video/sis/init.h: removal of old code
has been removed from the -mm tree. Its filename is
drivers-video-sis-inith-removal-of-old-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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
origin.patch
git-scsi-misc.patch
drivers-scsi-pcmcia-nsp_csh-removal-of-old.patch
fs-xfs-xfs_dmapih-removal-of-old-code.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
