- fb-menu-fix-fb_omap-dependencies-so-that-menu-is-displayed.patch removed from -mm tree

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

 



The patch titled
     fb menu: fix FB_OMAP dependencies so that menu is displayed correctly
has been removed from the -mm tree.  Its filename was
     fb-menu-fix-fb_omap-dependencies-so-that-menu-is-displayed.patch

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

------------------------------------------------------
Subject: fb menu: fix FB_OMAP dependencies so that menu is displayed correctly
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

Fix FB_OMAP dependencies so that the OMAP FB driver options are presented
correctly.

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/video/Kconfig      |    4 +---
 drivers/video/omap/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff -puN drivers/video/Kconfig~fb-menu-fix-fb_omap-dependencies-so-that-menu-is-displayed drivers/video/Kconfig
--- a/drivers/video/Kconfig~fb-menu-fix-fb_omap-dependencies-so-that-menu-is-displayed
+++ a/drivers/video/Kconfig
@@ -1892,9 +1892,7 @@ config FB_VIRTUAL
 
 	  If unsure, say N.
 
-if ARCH_OMAP
-	source "drivers/video/omap/Kconfig"
-endif
+source "drivers/video/omap/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/display/Kconfig"
diff -puN drivers/video/omap/Kconfig~fb-menu-fix-fb_omap-dependencies-so-that-menu-is-displayed drivers/video/omap/Kconfig
--- a/drivers/video/omap/Kconfig~fb-menu-fix-fb_omap-dependencies-so-that-menu-is-displayed
+++ a/drivers/video/omap/Kconfig
@@ -1,6 +1,6 @@
 config FB_OMAP
 	tristate "OMAP frame buffer support (EXPERIMENTAL)"
-	depends on FB
+	depends on FB && ARCH_OMAP
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
_

Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are

origin.patch
git-dvb.patch
git-kbuild.patch
git-unionfs.patch
git-watchdog.patch
git-ipwireless_cs.patch
x86-bitops_32h-style-cleanups.patch
voyager-use-struct-instead-of-param.patch
move-kprobes-examples-to-samples-resend.patch
move-kprobes-examples-to-samples-resend-checkpatch-fixes.patch
fs-menu-small-reorg.patch
profile-likely-unlikely-macros.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