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/dma/at_hdmac_regs.h
View file

@ -11,7 +11,7 @@
#ifndef AT_HDMAC_REGS_H
#define AT_HDMAC_REGS_H
#include <mach/at_hdmac.h>
#include <linux/platform_data/dma-atmel.h>
#define AT_DMA_MAX_NR_CHANNELS 8

2
drivers/dma/ep93xx_dma.c
View file

@ -26,7 +26,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-ep93xx.h>
#include "dmaengine.h"

2
drivers/dma/imx-dma.c
View file

@ -28,7 +28,7 @@
#include <linux/module.h>
#include <asm/irq.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#include "dmaengine.h"

4
drivers/dma/imx-sdma.c
View file

@ -38,8 +38,8 @@
#include <linux/of_device.h>
#include <asm/irq.h>
#include <mach/sdma.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-imx-sdma.h>
#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#include "dmaengine.h"

2
drivers/dma/mmp_tdma.c
View file

@ -19,7 +19,7 @@
#include <linux/platform_device.h>
#include <linux/device.h>
#include <mach/regs-icu.h>
#include <mach/sram.h>
#include <linux/platform_data/dma-mmp_tdma.h>
#include "dmaengine.h"

2
drivers/dma/mv_xor.c
View file

@ -26,7 +26,7 @@
#include <linux/platform_device.h>
#include <linux/memory.h>
#include <linux/clk.h>
#include <plat/mv_xor.h>
#include <linux/platform_data/dma-mv_xor.h>
#include "dmaengine.h"
#include "mv_xor.h"