Merge branch 'multiplatform/platform-data' into next/multiplatform

* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 0 insertions, 43 deletions

diff --git a/arch/arm/plat-mxc/include/mach/esdhc.h b/arch/arm/plat-mxc/include/mach/esdhc.h
deleted file mode 100644
index aaf97481f413..000000000000
--- a/arch/arm/plat-mxc/include/mach/esdhc.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010 Wolfram Sang <w.sang@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; version 2
- * of the License.
- */
-
-#ifndef __ASM_ARCH_IMX_ESDHC_H
-#define __ASM_ARCH_IMX_ESDHC_H
-
-enum wp_types {
-        ESDHC_WP_NONE,          /* no WP, neither controller nor gpio */
-        ESDHC_WP_CONTROLLER,    /* mmc controller internal WP */
-        ESDHC_WP_GPIO,          /* external gpio pin for WP */
-};
-
-enum cd_types {
-        ESDHC_CD_NONE,          /* no CD, neither controller nor gpio */
-        ESDHC_CD_CONTROLLER,    /* mmc controller internal CD */
-        ESDHC_CD_GPIO,          /* external gpio pin for CD */
-        ESDHC_CD_PERMANENT,     /* no CD, card permanently wired to host */
-};
-
-/**
- * struct esdhc_platform_data - platform data for esdhc on i.MX
- *
- * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35.
- *
- * @wp_gpio:    gpio for write_protect
- * @cd_gpio:    gpio for card_detect interrupt
- * @wp_type:    type of write_protect method (see wp_types enum above)
- * @cd_type:    type of card_detect method (see cd_types enum above)
- */
-
-struct esdhc_platform_data {
-        unsigned int wp_gpio;
-        unsigned int cd_gpio;
-        enum wp_types wp_type;
-        enum cd_types cd_type;
-};
-#endif /* __ASM_ARCH_IMX_ESDHC_H */