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

diff --git a/arch/arm/include/asm/mach/udc_pxa2xx.h b/arch/arm/include/asm/mach/udc_pxa2xx.h
index f3eabf1ecec333643273d9f797a7afd70cc4894d..833306ee9e7fec2059c457e7e107d586198c4de6 100644 (file)
--- a/arch/arm/include/asm/mach/udc_pxa2xx.h
+++ b/arch/arm/include/asm/mach/udc_pxa2xx.h
@@ -21,8 +21,8 @@ struct pxa2xx_udc_mach_info {
         * here.  Note that sometimes the signals go through inverters...
         */
        bool    gpio_vbus_inverted;
-       u16     gpio_vbus;                      /* high == vbus present */
+       int     gpio_vbus;                      /* high == vbus present */
        bool    gpio_pullup_inverted;
-       u16     gpio_pullup;                    /* high == pullup activated */
+       int     gpio_pullup;                    /* high == pullup activated */
 };
 

diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index d60db87dde0872e32fddae50a0454e4bdfc6161f..fa6a708b40997feb7ae0296c04d91d1afa8930c9 100644 (file)
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -697,7 +697,7 @@ static struct i2c_board_info __initdata mioa701_pi2c_devices[] = {
 };
 
 /* Board I2C devices. */
-static struct i2c_board_info __initdata mioa701_i2c_devices[] = {
+static struct i2c_board_info mioa701_i2c_devices[] = {
        {
                I2C_BOARD_INFO("mt9m111", 0x5d),
        },

diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index f5d1ae3db3a46783b4421bf818d50ca4eed1e690..d303c6929d3282803e3b547e9509e7b7aab3b177 100644 (file)
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -3,8 +3,9 @@
  *
  *  Support for the Zipit Z2 Handheld device.
  *
- *  Author:    Ken McGuire
- *  Created:   Jan 25, 2009
+ *  Copyright (C) 2009-2010 Marek Vasut <marek.vasut@gmail.com>
+ *
+ *  Based on research and code by: Ken McGuire
  *  Based on mainstone.c as modified for the Zipit Z2.
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -157,21 +158,14 @@ static struct mtd_partition z2_flash_parts[] = {
        {
                .name   = "U-Boot Bootloader",
                .offset = 0x0,
-               .size   = 0x20000,
-       },
-       {
-               .name   = "Linux Kernel",
-               .offset = 0x20000,
-               .size   = 0x220000,
-       },
-       {
-               .name   = "Filesystem",
-               .offset = 0x240000,
-               .size   = 0x5b0000,
-       },
-       {
+               .size   = 0x40000,
+       }, {
                .name   = "U-Boot Environment",
-               .offset = 0x7f0000,
+               .offset = 0x40000,
+               .size   = 0x60000,
+       }, {
+               .name   = "Flash",
+               .offset = 0x60000,
                .size   = MTDPART_SIZ_FULL,
        },
 };

diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile
index 6187edfbcb777a13a11eb5eea273abb4901b5c7d..a17cc0c6a6b0117f1a590f3d773bf10c69e2581a 100644 (file)
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
@@ -2,8 +2,9 @@
 # Makefile for code common across different PXA processor families
 #
 
-obj-y  := dma.o pmu.o
+obj-y  := dma.o
 
+obj-$(CONFIG_ARCH_PXA)         += pmu.o
 obj-$(CONFIG_GENERIC_GPIO)     += gpio.o
 obj-$(CONFIG_PXA3xx)           += mfp.o
 obj-$(CONFIG_ARCH_MMP)         += mfp.o

diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index 9cca465436e39d07569db4a0a2535332ae2d5fb6..85064a9f649ed34acbfad8db3980afd42bb208ec 100644 (file)
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -9,19 +9,13 @@
  *
  */
 
-#include <linux/init.h>
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/power_supply.h>
-#include <linux/i2c.h>
-#include <linux/spinlock.h>
-#include <linux/interrupt.h>
 #include <linux/gpio.h>
+#include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <asm/irq.h>
-#include <asm/mach/irq.h>
+#include <linux/power_supply.h>
+#include <linux/slab.h>
 #include <linux/z2_battery.h>
 
 #define        Z2_DEFAULT_NAME "Z2"