The patch titled
fbdev: Remove duplicate #include's
has been added to the -mm tree. Its filename is
fbdev-remove-duplicate-includes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
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
--- devel/drivers/video/fbmem.c~fbdev-remove-duplicate-includes 2006-04-22 01:11:03.000000000 -0700
+++ devel-akpm/drivers/video/fbmem.c 2006-04-22 01:11:03.000000000 -0700
@@ -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
--- devel/drivers/video/fbmon.c~fbdev-remove-duplicate-includes 2006-04-22 01:11:03.000000000 -0700
+++ devel-akpm/drivers/video/fbmon.c 2006-04-22 01:11:03.000000000 -0700
@@ -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
--- devel/drivers/video/tgafb.c~fbdev-remove-duplicate-includes 2006-04-22 01:11:03.000000000 -0700
+++ devel-akpm/drivers/video/tgafb.c 2006-04-22 01:11:03.000000000 -0700
@@ -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
git-acpi.patch
acpiphp-use-new-dock-driver-fix.patch
git-dvb.patch
drivers-media-video-bt866c-small-fixes-2.patch
gregkh-i2c-w1-cleanups-fix.patch
git-infiniband.patch
git-intelfb.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-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
scsi-megaraid-megaraid_mmc-fix-a-null-pointer-dereference.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
ieee80211_wxc-remove-dead-code.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
kernel-power-snapshotc-cleanups.patch
remove-fs-jffs2-ioctlc.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
time-i386-clocksource-drivers.patch
dlm-recovery.patch
dlm-build.patch
dlm-cleanup-unused-functions.patch
dlm-include-own-headers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
x86_64-unexport-ia32_sys_call_table.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
