- fbdev-cleanup-the-config_video_select-mess.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     fbdev: cleanup the CONFIG_VIDEO_SELECT mess

has been removed from the -mm tree.  Its filename is

     fbdev-cleanup-the-config_video_select-mess.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: fbdev: cleanup the CONFIG_VIDEO_SELECT mess
From: Adrian Bunk <bunk@xxxxxxxxx>


We had three (sic) VIDEO_SELECT options:
- two in drivers/video/Kconfig
- one in drivers/video/console/Kconfig

This patch removes the two options in drivers/video/Kconfig and also removes
the unneeded usage in drivers/video/sis/sis_main.c .

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/video/Kconfig        |   11 -----------
 drivers/video/sis/sis_main.c |    2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff -puN drivers/video/Kconfig~fbdev-cleanup-the-config_video_select-mess drivers/video/Kconfig
--- a/drivers/video/Kconfig~fbdev-cleanup-the-config_video_select-mess
+++ a/drivers/video/Kconfig
@@ -551,11 +551,6 @@ config FB_VESA
 	  You will get a boot time penguin logo at no additional cost. Please
 	  read <file:Documentation/fb/vesafb.txt>. If unsure, say Y.
 
-config VIDEO_SELECT
-	bool
-	depends on FB_VESA
-	default y
-
 config FB_HGA
 	tristate "Hercules mono graphics support"
 	depends on FB && X86
@@ -578,12 +573,6 @@ config FB_HGA_ACCEL
 	This will compile the Hercules mono graphics with
 	acceleration functions.
 
-
-config VIDEO_SELECT
-	bool
-	depends on (FB = y) && X86
-	default y
-
 config FB_SGIVW
 	tristate "SGI Visual Workstation framebuffer support"
 	depends on FB && X86_VISWS
diff -puN drivers/video/sis/sis_main.c~fbdev-cleanup-the-config_video_select-mess drivers/video/sis/sis_main.c
--- a/drivers/video/sis/sis_main.c~fbdev-cleanup-the-config_video_select-mess
+++ a/drivers/video/sis/sis_main.c
@@ -275,7 +275,7 @@ sisfb_search_mode(char *name, BOOLEAN qu
 static void __devinit
 sisfb_get_vga_mode_from_kernel(void)
 {
-#if (defined(__i386__) || defined(__x86_64__)) && defined(CONFIG_VIDEO_SELECT)
+#ifdef CONFIG_X86
 	char mymode[32];
 	int  mydepth = screen_info.lfb_depth;
 
_

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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux