A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* 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 <[email protected]>
This commit is contained in:
Olof Johansson 2012-09-22 00:22:33 -07:00
commit e3a66aa33a
397 changed files with 573 additions and 574 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/mmc/host/davinci_mmc.c
View file

@ -33,7 +33,7 @@
#include <linux/dma-mapping.h>
#include <linux/mmc/mmc.h>
#include <mach/mmc.h>
#include <linux/platform_data/mmc-davinci.h>
#include <mach/edma.h>
/*

2
drivers/mmc/host/msm_sdcc.c
View file

@ -42,7 +42,7 @@
#include <asm/div64.h>
#include <asm/sizes.h>
#include <mach/mmc.h>
#include <linux/platform_data/mmc-msm_sdcc.h>
#include <mach/msm_iomap.h>
#include <mach/dma.h>
#include <mach/clk.h>

2
drivers/mmc/host/mvsdio.c
View file

@ -25,7 +25,7 @@
#include <asm/sizes.h>
#include <asm/unaligned.h>
#include <plat/mvsdio.h>
#include <linux/platform_data/mmc-mvsdio.h>
#include "mvsdio.h"

4
drivers/mmc/host/mxcmmc.c
View file

@ -38,9 +38,9 @@
#include <asm/dma.h>
#include <asm/irq.h>
#include <asm/sizes.h>
#include <mach/mmc.h>
#include <linux/platform_data/mmc-mxcmmc.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#define DRIVER_NAME "mxc-mmc"

2
drivers/mmc/host/pxamci.c
View file

@ -35,7 +35,7 @@
#include <mach/hardware.h>
#include <mach/dma.h>
#include <mach/mmc.h>
#include <linux/platform_data/mmc-pxamci.h>
#include "pxamci.h"

2
drivers/mmc/host/s3cmci.c
View file

@ -27,7 +27,7 @@
#include <mach/regs-sdi.h>
#include <plat/mci.h>
#include <linux/platform_data/mmc-s3cmci.h>
#include "s3cmci.h"

2
drivers/mmc/host/sdhci-esdhc-imx.c
View file

@ -25,7 +25,7 @@
#include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/pinctrl/consumer.h>
#include <mach/esdhc.h>
#include <linux/platform_data/mmc-esdhc-imx.h>
#include "sdhci-pltfm.h"
#include "sdhci-esdhc.h"

3
drivers/mmc/host/sdhci-tegra.c
View file

@ -27,7 +27,8 @@
#include <asm/gpio.h>
#include <mach/sdhci.h>
#include <mach/gpio-tegra.h>
#include <linux/platform_data/mmc-sdhci-tegra.h>
#include "sdhci-pltfm.h"