Subject: [merged] fbdev-fb_goldfish-should-depend-on-has_dma.patch removed from -mm tree
To: geert@xxxxxxxxxxxxxx,FlorianSchandinat@xxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 28 May 2013 12:37:09 -0700
The patch titled
Subject: fbdev: FB_GOLDFISH should depend on HAS_DMA
has been removed from the -mm tree. Its filename was
fbdev-fb_goldfish-should-depend-on-has_dma.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Subject: fbdev: FB_GOLDFISH should depend on HAS_DMA
If NO_DMA=y:
drivers/built-in.o: In function `goldfish_fb_remove':
drivers/video/goldfishfb.c:301: undefined reference to `dma_free_coherent'
drivers/built-in.o: In function `goldfish_fb_probe':
drivers/video/goldfishfb.c:247: undefined reference to `dma_alloc_coherent'
drivers/video/goldfishfb.c:280: undefined reference to `dma_free_coherent'
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/video/Kconfig~fbdev-fb_goldfish-should-depend-on-has_dma drivers/video/Kconfig
--- a/drivers/video/Kconfig~fbdev-fb_goldfish-should-depend-on-has_dma
+++ a/drivers/video/Kconfig
@@ -2199,7 +2199,7 @@ config FB_XILINX
config FB_GOLDFISH
tristate "Goldfish Framebuffer"
- depends on FB
+ depends on FB && HAS_DMA
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
_
Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are
origin.patch
linux-next.patch
init-remove-permanent-string-buffer-from-do_one_initcall.patch
drivers-rtc-rtc-msm6242c-remove-empty-function.patch
lib-add-weak-clz-ctz-functions.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
