Merge branch 'next/fixes' into next/cleanup

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-davinci/dm355.c
Simple merge

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc arch/arm/mach-davinci/dm646x.c
Simple merge

diff --cc arch/arm/mach-mx5/pm-imx5.c
Simple merge

diff --cc arch/arm/mach-mxs/include/mach/gpio.h
index 56025aa0a639ea68d7b523c147004215dc0010cf,bb11e63261e491fb36c750787487c23bce2dc313..40a8c178f10d9e85a2873c83247c3f2fe553f408
--- 1/arch/arm/mach-mxs/include/mach/gpio.h
--- 2/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@@ -1,31 -1,27 +1,1 @@@
--/*
-- * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
-- * Copyright 2008 Juergen Beisert, kernel@pengutronix.de
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-- * MA  02110-1301, USA.
-- */
--
--#ifndef __MACH_MXS_GPIO_H__
--#define __MACH_MXS_GPIO_H__
--
- #include <asm-generic/gpio.h>
 -#define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
--
- /* use gpiolib dispatchers */
- #define gpio_get_value                __gpio_get_value
- #define gpio_set_value                __gpio_set_value
- #define gpio_cansleep         __gpio_cansleep
- #define gpio_to_irq           __gpio_to_irq
 -#define irq_to_gpio(irq)      ((irq) - MXS_GPIO_IRQ_START)
--
--#endif /* __MACH_MXS_GPIO_H__ */
++/* empty */

diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/hsmmc.c
Simple merge

diff --cc arch/arm/mach-prima2/prima2.c
Simple merge

diff --cc arch/arm/mach-u300/Kconfig
Simple merge

diff --cc arch/arm/mach-u300/core.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500-pins.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/gpio.h
index 44af0064ba1a96485d30bece8ee4d3a3183e0369,3e1ffc8b8f0c2d56283bdbc92b476bb07f86196d..40a8c178f10d9e85a2873c83247c3f2fe553f408
--- 1/arch/arm/plat-mxc/include/mach/gpio.h
--- 2/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@@ -1,32 -1,33 +1,1 @@@
--/*
-- * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
-- * Copyright 2008 Juergen Beisert, kernel@pengutronix.de
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-- */
--
--#ifndef __ASM_ARCH_MXC_GPIO_H__
--#define __ASM_ARCH_MXC_GPIO_H__
--
--#include <linux/spinlock.h>
--#include <mach/hardware.h>
- #include <asm-generic/gpio.h>
--
- /* use gpiolib dispatchers */
- #define gpio_get_value                __gpio_get_value
- #define gpio_set_value                __gpio_set_value
- #define gpio_cansleep         __gpio_cansleep
- #define gpio_to_irq           __gpio_to_irq
 -
 -/* There's a off-by-one betweem the gpio bank number and the gpiochip */
 -/* range e.g. GPIO_1_5 is gpio 5 under linux */
 -#define IMX_GPIO_NR(bank, nr)         (((bank) - 1) * 32 + (nr))
 -
 -#define gpio_to_irq(gpio)     (MXC_GPIO_IRQ_START + (gpio))
 -#define irq_to_gpio(irq)      ((irq) - MXC_GPIO_IRQ_START)
--
--#endif
++/* empty */

diff --cc arch/arm/plat-mxc/include/mach/iomux-v3.h
Simple merge

diff --cc arch/arm/plat-omap/devices.c
index bd9a06b3ee890e662077ea52dad43289b392c4a4,64c3bd4aa54ecbd43c9d4f6eeccaaf97fa0001e1..acd132c296473b839964e2211a50f368baabd39d
--- 1/arch/arm/plat-omap/devices.c
--- 2/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@@ -24,10 -24,55 +24,9 @@@
  #include <plat/tc.h>
  #include <plat/board.h>
  #include <plat/mmc.h>
- #include <mach/gpio.h>
  #include <plat/menelaus.h>
 -#include <plat/mcbsp.h>
  #include <plat/omap44xx.h>
  
 -/*-------------------------------------------------------------------------*/
 -
 -#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
 -
 -static struct platform_device **omap_mcbsp_devices;
 -
 -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
 -                      struct omap_mcbsp_platform_data *config, int size)
 -{
 -      int i;
 -
 -      omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
 -                                   GFP_KERNEL);
 -      if (!omap_mcbsp_devices) {
 -              printk(KERN_ERR "Could not register McBSP devices\n");
 -              return;
 -      }
 -
 -      for (i = 0; i < size; i++) {
 -              struct platform_device *new_mcbsp;
 -              int ret;
 -
 -              new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
 -              if (!new_mcbsp)
 -                      continue;
 -              platform_device_add_resources(new_mcbsp, &res[i * res_count],
 -                                      res_count);
 -              new_mcbsp->dev.platform_data = &config[i];
 -              ret = platform_device_add(new_mcbsp);
 -              if (ret) {
 -                      platform_device_put(new_mcbsp);
 -                      continue;
 -              }
 -              omap_mcbsp_devices[i] = new_mcbsp;
 -      }
 -}
 -
 -#else
 -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
 -                      struct omap_mcbsp_platform_data *config, int size)
 -{  }
 -#endif
 -
 -/*-------------------------------------------------------------------------*/
 -
  #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
                defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)