The patch titled
fbdev: Remove duplicate #include's
has been removed from the -mm tree. Its filename is
fbdev-remove-duplicate-includes.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: fbdev: Remove duplicate #include's
From: Adrian Bunk <bunk@xxxxxxxxx>
Remove unneeded duplicate #include's of the same header file.
In the case of fbmon.c linux/pci.h is now #include'd unconditional, but
this should be safe.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/fbmem.c | 2 --
drivers/video/fbmon.c | 3 +--
drivers/video/tgafb.c | 1 -
3 files changed, 1 insertion(+), 5 deletions(-)
diff -puN drivers/video/fbmem.c~fbdev-remove-duplicate-includes drivers/video/fbmem.c
--- a/drivers/video/fbmem.c~fbdev-remove-duplicate-includes
+++ a/drivers/video/fbmem.c
@@ -34,7 +34,6 @@
#endif
#include <linux/devfs_fs_kernel.h>
#include <linux/err.h>
-#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/efi.h>
@@ -162,7 +161,6 @@ char* fb_get_buffer_offset(struct fb_inf
}
#ifdef CONFIG_LOGO
-#include <linux/linux_logo.h>
static inline unsigned safe_shift(unsigned d, int n)
{
diff -puN drivers/video/fbmon.c~fbdev-remove-duplicate-includes drivers/video/fbmon.c
--- a/drivers/video/fbmon.c~fbdev-remove-duplicate-includes
+++ a/drivers/video/fbmon.c
@@ -29,9 +29,9 @@
#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/module.h>
+#include <linux/pci.h>
#include <video/edid.h>
#ifdef CONFIG_PPC_OF
-#include <linux/pci.h>
#include <asm/prom.h>
#include <asm/pci-bridge.h>
#endif
@@ -1282,7 +1282,6 @@ int fb_validate_mode(const struct fb_var
}
#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__)
-#include <linux/pci.h>
/*
* We need to ensure that the EDID block is only returned for
diff -puN drivers/video/tgafb.c~fbdev-remove-duplicate-includes drivers/video/tgafb.c
--- a/drivers/video/tgafb.c~fbdev-remove-duplicate-includes
+++ a/drivers/video/tgafb.c
@@ -26,7 +26,6 @@
#include <linux/selection.h>
#include <asm/io.h>
#include <video/tgafb.h>
-#include <linux/selection.h>
/*
* Local functions.
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
acpiphp-use-new-dock-driver.patch
drivers-acpi-scanc-make-acpi_bus_type-static.patch
git-agpgart.patch
the-scheduled-unexport-of-insert_resource.patch
git-gfs2.patch
make-variables-static-after-klibc-merge.patch
make-drivers-scsi-pata_pcmciacpcmcia_remove_one-static.patch
make-drivers-scsi-pata_it821xcit821x_passthru_dev_select-static.patch
ni5010-netcard-cleanup-fix.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-qla2xxx-make-more-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-arcmsr-cleanups.patch
drivers-scsi-advansysc-cleanups.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
acx1xx-wireless-driver.patch
fs-bufferc-possible-cleanups.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-implement-clone_newuts-flag-tidy.patch
task-watchers-register-semundo-task-watcher-cleanup.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
drivers-md-raid5c-remove-an-unused-variable.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.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
