Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

3 files changed, 16 insertions, 1 deletions

diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 4d689b59c58c..1083e2c5dec6 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -44,6 +44,7 @@
     defined(CONFIG_MACH_MAINSTONE) ||\
     defined(CONFIG_MACH_ZYLONITE) ||\
     defined(CONFIG_MACH_LITTLETON) ||\
+    defined(CONFIG_MACH_ZYLONITE2) ||\
     defined(CONFIG_ARCH_VIPER)
 
 #include <asm/mach-types.h>
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7d7f576da202..9be11b0963f2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -628,7 +628,7 @@ config SERIAL_MPSC_CONSOLE
 
 config SERIAL_PXA
         bool "PXA serial port support"
-        depends on ARM && ARCH_PXA
+        depends on ARCH_PXA || ARCH_MMP
         select SERIAL_CORE
         help
           If you have a machine based on an Intel XScale PXA2xx CPU you
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 07b371b4b072..84f63205c46d 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -882,10 +882,21 @@ static void __devinit init_pxafb_overlay(struct pxafb_info *fbi,
         init_completion(&ofb->branch_done);
 }
 
+static inline int pxafb_overlay_supported(void)
+{
+        if (cpu_is_pxa27x() || cpu_is_pxa3xx())
+                return 1;
+
+        return 0;
+}
+
 static int __devinit pxafb_overlay_init(struct pxafb_info *fbi)
 {
         int i, ret;
 
+        if (!pxafb_overlay_supported())
+                return 0;
+
         for (i = 0; i < 2; i++) {
                 init_pxafb_overlay(fbi, &fbi->overlay[i], i);
                 ret = register_framebuffer(&fbi->overlay[i].fb);
@@ -908,6 +919,9 @@ static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi)
 {
         int i;
 
+        if (!pxafb_overlay_supported())
+                return;
+
         for (i = 0; i < 2; i++)
                 unregister_framebuffer(&fbi->overlay[i].fb);
 }