suyu-github/horinux
0
0
Fork 0
mirror of https://github.com/suyu-emu/horinux.git synced 2026-09-21 14:15:21 -07:00
Code Issues Packages Projects Releases 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 <olof@lixom.net>
This commit is contained in:
Olof Johansson
2012-09-22 01:07:21 -07:00
parent be2109e13f 6884b68045
commit e3a66aa33a
397 changed files with 573 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/soc/ep93xx/ep93xx-ac97.c
+1 -1
View File
@@ -21,7 +21,7 @@
#include <sound/ac97_codec.h>
#include <sound/soc.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-ep93xx.h>
#include "ep93xx-pcm.h"
/*
sound/soc/ep93xx/ep93xx-i2s.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include <mach/hardware.h>
#include <mach/ep93xx-regs.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-ep93xx.h>
#include "ep93xx-pcm.h"
sound/soc/ep93xx/ep93xx-pcm.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-ep93xx.h>
#include <mach/hardware.h>
#include <mach/ep93xx-regs.h>
sound/soc/fsl/imx-pcm-dma.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-imx.h>
#include "imx-pcm.h"
sound/soc/fsl/imx-pcm-fiq.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include <asm/fiq.h>
#include <mach/irqs.h>
#include <mach/ssi.h>
#include <linux/platform_data/asoc-imx-ssi.h>
#include "imx-ssi.h"
sound/soc/fsl/imx-ssi.c
+1 -1
View File
@@ -47,7 +47,7 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <mach/ssi.h>
#include <linux/platform_data/asoc-imx-ssi.h>
#include <mach/hardware.h>
#include "imx-ssi.h"
sound/soc/fsl/imx-ssi.h
+1 -1
View File
@@ -186,7 +186,7 @@
#define DRV_NAME "imx-ssi"
#include <linux/dmaengine.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-imx.h>
#include "imx-pcm.h"
struct imx_ssi {
sound/soc/kirkwood/kirkwood-i2s.c
+1 -1
View File
@@ -21,7 +21,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <plat/audio.h>
#include <linux/platform_data/asoc-kirkwood.h>
#include "kirkwood.h"
#define DRV_NAME "kirkwood-i2s"
sound/soc/kirkwood/kirkwood-openrd.c
+1 -1
View File
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <sound/soc.h>
#include <mach/kirkwood.h>
#include <plat/audio.h>
#include <linux/platform_data/asoc-kirkwood.h>
#include <asm/mach-types.h>
#include "../codecs/cs42l51.h"
sound/soc/kirkwood/kirkwood-t5325.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <sound/soc.h>
#include <mach/kirkwood.h>
#include <plat/audio.h>
#include <linux/platform_data/asoc-kirkwood.h>
#include <asm/mach-types.h>
#include "../codecs/alc5623.h"
sound/soc/pxa/palm27x.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include <asm/mach-types.h>
#include <mach/audio.h>
#include <mach/palmasoc.h>
#include <linux/platform_data/asoc-palm27x.h>
#include "../codecs/wm9712.h"
#include "pxa2xx-ac97.h"
sound/soc/samsung/ac97.c
+1 -1
View File
@@ -21,7 +21,7 @@
#include <mach/dma.h>
#include <plat/regs-ac97.h>
#include <plat/audio.h>
#include <linux/platform_data/asoc-s3c.h>
#include "dma.h"
sound/soc/samsung/i2s.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include <sound/soc.h>
#include <sound/pcm_params.h>
#include <plat/audio.h>
#include <linux/platform_data/asoc-s3c.h>
#include "dma.h"
#include "idma.h"
sound/soc/samsung/pcm.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include <sound/soc.h>
#include <sound/pcm_params.h>
#include <plat/audio.h>
#include <linux/platform_data/asoc-s3c.h>
#include <mach/dma.h>
#include "dma.h"
sound/soc/samsung/s3c24xx_simtec.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include <sound/soc.h>
#include <plat/audio-simtec.h>
#include <linux/platform_data/asoc-s3c24xx_simtec.h>
#include "s3c24xx-i2s.h"
#include "s3c24xx_simtec.h"
sound/soc/samsung/spdif.c
+1 -1
View File
@@ -17,7 +17,7 @@
#include <sound/soc.h>
#include <sound/pcm_params.h>
#include <plat/audio.h>
#include <linux/platform_data/asoc-s3c.h>
#include <mach/dma.h>
#include "dma.h"