The patch titled
fbdev: Fujitsu MB862xx framebuffer driver i386 allmodconfig fix
has been added to the -mm tree. Its filename is
add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: fbdev: Fujitsu MB862xx framebuffer driver i386 allmodconfig fix
From: Anatolij Gustschin <agust@xxxxxxx>
Fix i386 allmodconfig build previously failed with:
drivers/video/mb862xx/mb862xxfb.h:65:2: error: #error "Select Lime GDC or CoralP/Carmine support, but not both together"
drivers/video/mb862xx/mb862xxfb.c:549: warning: 'struct of_device' declared inside parameter list
drivers/video/mb862xx/mb862xxfb.c:549: warning: its scope is only this definition or declaration, which is probably not what you want
...
Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
Cc: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Cc: Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>
Cc: Krzysztof Helt <krzysztof.h1@xxxxxxxxx>
Cc: Matteo Fortini <m.fortini@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/Kconfig | 3 ++-
drivers/video/mb862xx/mb862xxfb.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/video/Kconfig~add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix-2 drivers/video/Kconfig
--- a/drivers/video/Kconfig~add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix-2
+++ a/drivers/video/Kconfig
@@ -2094,7 +2094,7 @@ config FB_MB862XX
config FB_MB862XX_PCI_GDC
bool "Carmine/Coral-P(A) GDC"
- depends on FB_MB862XX
+ depends on PCI && FB_MB862XX
---help---
This enables framebuffer support for Fujitsu Carmine/Coral-P(A)
PCI graphics controller devices.
@@ -2102,6 +2102,7 @@ config FB_MB862XX_PCI_GDC
config FB_MB862XX_LIME
bool "Lime GDC"
depends on FB_MB862XX
+ depends on OF && !FB_MB862XX_PCI_GDC
select FB_FOREIGN_ENDIAN
select FB_LITTLE_ENDIAN
---help---
diff -puN drivers/video/mb862xx/mb862xxfb.c~add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix-2 drivers/video/mb862xx/mb862xxfb.c
--- a/drivers/video/mb862xx/mb862xxfb.c~add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix-2
+++ a/drivers/video/mb862xx/mb862xxfb.c
@@ -554,7 +554,7 @@ static int __devinit of_platform_mb862xx
struct fb_info *info;
struct resource res;
resource_size_t res_size;
- unsigned long ret;
+ unsigned long ret = -ENODEV;
if (of_address_to_resource(np, 0, &res)) {
dev_err(dev, "Invalid address\n");
_
Patches currently in -mm which might be from agust@xxxxxxx are
add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs.patch
add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix-2.patch
add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix.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
