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

diff --combined arch/arm/mach-pxa/e740.c
index e0c3aaf,f2402f6..54af7ed
--- 1/arch/arm/mach-pxa/e740.c
--- 2/arch/arm/mach-pxa/e740.c
+++ b/arch/arm/mach-pxa/e740.c
@@@ -24,7 -24,9 +24,7 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  
 -#include <mach/mfp-pxa25x.h>
 -#include <mach/pxa-regs.h>
 -#include <mach/hardware.h>
 +#include <mach/pxa25x.h>
  #include <mach/eseries-gpio.h>
  #include <mach/udc.h>
  #include <mach/irda.h>
@@@ -187,7 -189,7 +187,7 @@@ static void __init e740_init(void
  {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));
        eseries_register_clks();
-       clk_add_alias("CLK_CK48M", &e740_t7l66xb_device.dev,
+       clk_add_alias("CLK_CK48M", e740_t7l66xb_device.name,
                        "UDCCLK", &pxa25x_device_udc.dev),
        eseries_get_tmio_gpios();
        platform_add_devices(devices, ARRAY_SIZE(devices));

diff --combined arch/arm/mach-pxa/e750.c
index 84b050f,1379f9a..16ae721
--- 1/arch/arm/mach-pxa/e750.c
--- 2/arch/arm/mach-pxa/e750.c
+++ b/arch/arm/mach-pxa/e750.c
@@@ -23,7 -23,9 +23,7 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  
 -#include <mach/mfp-pxa25x.h>
 -#include <mach/pxa-regs.h>
 -#include <mach/hardware.h>
 +#include <mach/pxa25x.h>
  #include <mach/eseries-gpio.h>
  #include <mach/udc.h>
  #include <mach/irda.h>
@@@ -188,7 -190,7 +188,7 @@@ static struct platform_device *devices[
  static void __init e750_init(void)
  {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(e750_pin_config));
-       clk_add_alias("CLK_CK3P6MI", &e750_tc6393xb_device.dev,
+       clk_add_alias("CLK_CK3P6MI", e750_tc6393xb_device.name,
                        "GPIO11_CLK", NULL),
        eseries_get_tmio_gpios();
        platform_add_devices(devices, ARRAY_SIZE(devices));

diff --combined arch/arm/mach-pxa/e800.c
index f8924f6,0cc0062..74ab098
--- 1/arch/arm/mach-pxa/e800.c
--- 2/arch/arm/mach-pxa/e800.c
+++ b/arch/arm/mach-pxa/e800.c
@@@ -23,7 -23,9 +23,7 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  
 -#include <mach/mfp-pxa25x.h>
 -#include <mach/pxa-regs.h>
 -#include <mach/hardware.h>
 +#include <mach/pxa25x.h>
  #include <mach/eseries-gpio.h>
  #include <mach/udc.h>
  #include <mach/irqs.h>
@@@ -194,7 -196,7 +194,7 @@@ static struct platform_device *devices[
  
  static void __init e800_init(void)
  {
-       clk_add_alias("CLK_CK3P6MI", &e800_tc6393xb_device.dev,
+       clk_add_alias("CLK_CK3P6MI", e800_tc6393xb_device.name,
                        "GPIO11_CLK", NULL),
        eseries_get_tmio_gpios();
        platform_add_devices(devices, ARRAY_SIZE(devices));

diff --combined arch/arm/mach-pxa/tosa.c
index 66b1380,3fe137f..581dc10
--- 1/arch/arm/mach-pxa/tosa.c
--- 2/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@@ -36,8 -36,8 +36,8 @@@
  
  #include <asm/setup.h>
  #include <asm/mach-types.h>
 -#include <mach/pxa2xx-regs.h>
 -#include <mach/mfp-pxa25x.h>
 +
 +#include <mach/pxa25x.h>
  #include <mach/reset.h>
  #include <mach/irda.h>
  #include <mach/i2c.h>
@@@ -919,7 -919,7 +919,7 @@@ static void __init tosa_init(void
        pxa2xx_set_spi_info(2, &pxa_ssp_master_info);
        spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
  
-       clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL);
+       clk_add_alias("CLK_CK3P6MI", tc6393xb_device.name, "GPIO11_CLK", NULL);
  
        platform_add_devices(devices, ARRAY_SIZE(devices));
  }

diff --combined drivers/video/pxafb.c
index 287aa1d,40a5d9d..81c8bd5
--- 1/drivers/video/pxafb.c
--- 2/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@@ -59,6 -59,7 +59,6 @@@
  #include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/div64.h>
 -#include <mach/pxa-regs.h>
  #include <mach/bitfield.h>
  #include <mach/pxafb.h>
  
@@@ -882,10 -883,21 +882,21 @@@ static void __devinit init_pxafb_overla
        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 -920,9 +919,9 @@@ static void __devexit pxafb_overlay_exi
  {
        int i;
  
+       if (!pxafb_overlay_supported())
+               return;
+ 
        for (i = 0; i < 2; i++)
                unregister_framebuffer(&fbi->overlay[i].fb);
  }