apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -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 00:22:33 -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
drivers/video/ep93xx-fb.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include <linux/clk.h>
#include <linux/fb.h>
#include <mach/fb.h>
#include <linux/platform_data/video-ep93xx.h>
/* Vertical Frame Timing Registers */
#define EP93XXFB_VLINES_TOTAL 0x0000 /* SW locked */
drivers/video/imxfb.c
+1 -1
View File
@@ -32,7 +32,7 @@
#include <linux/io.h>
#include <linux/math64.h>
#include <mach/imxfb.h>
#include <linux/platform_data/video-imxfb.h>
#include <mach/hardware.h>
/*
drivers/video/msm/mddi.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include <mach/msm_iomap.h>
#include <mach/irqs.h>
#include <mach/board.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
#include "mddi_hw.h"
#define FLAG_DISABLE_HIBERNATION 0x0001
drivers/video/msm/mddi_client_dummy.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
struct panel_info {
struct platform_device pdev;
drivers/video/msm/mddi_client_nt35399.c
+1 -1
View File
@@ -22,7 +22,7 @@
#include <linux/sched.h>
#include <linux/gpio.h>
#include <linux/slab.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait);
drivers/video/msm/mddi_client_toshiba.c
+1 -1
View File
@@ -22,7 +22,7 @@
#include <linux/gpio.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
#define LCD_CONTROL_BLOCK_BASE 0x110000
drivers/video/msm/mdp.c
+1 -1
View File
@@ -26,7 +26,7 @@
#include <linux/slab.h>
#include <mach/msm_iomap.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
#include <linux/platform_device.h>
#include <linux/export.h>
drivers/video/msm/mdp_hw.h
+1 -1
View File
@@ -16,7 +16,7 @@
#define _MDP_HW_H_
#include <mach/msm_iomap.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
struct mdp_info {
struct mdp_device mdp_dev;
drivers/video/msm/mdp_ppp.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include <linux/file.h>
#include <linux/delay.h>
#include <linux/msm_mdp.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
#include "mdp_hw.h"
#include "mdp_scale_tables.h"
drivers/video/msm/msm_fb.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include <linux/msm_mdp.h>
#include <linux/io.h>
#include <linux/uaccess.h>
#include <mach/msm_fb.h>
#include <linux/platform_data/video-msm_fb.h>
#include <mach/board.h>
#include <linux/workqueue.h>
#include <linux/clk.h>
drivers/video/mx3fb.c
+2 -2
View File
@@ -27,10 +27,10 @@
#include <linux/clk.h>
#include <linux/mutex.h>
#include <mach/dma.h>
#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#include <mach/ipu.h>
#include <mach/mx3fb.h>
#include <linux/platform_data/video-mx3fb.h>
#include <asm/io.h>
#include <asm/uaccess.h>
drivers/video/nuc900fb.c
+1 -1
View File
@@ -38,7 +38,7 @@
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <mach/regs-ldm.h>
#include <mach/fb.h>
#include <linux/platform_data/video-nuc900fb.h>
#include "nuc900fb.h"
drivers/video/nuc900fb.h
+1 -1
View File
@@ -16,7 +16,7 @@
#define __NUC900FB_H
#include <mach/map.h>
#include <mach/fb.h>
#include <linux/platform_data/video-nuc900fb.h>
enum nuc900_lcddrv_type {
LCDDRV_NUC910,
drivers/video/pxafb.c
+1 -1
View File
@@ -61,7 +61,7 @@
#include <asm/irq.h>
#include <asm/div64.h>
#include <mach/bitfield.h>
#include <mach/pxafb.h>
#include <linux/platform_data/video-pxafb.h>
/*
* Complain if VAR is out of range.
drivers/video/vt8500lcdfb.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include <linux/platform_device.h>
#include <linux/wait.h>
#include <mach/vt8500fb.h>
#include <linux/platform_data/video-vt8500lcdfb.h>
#include "vt8500lcdfb.h"
#include "wmt_ge_rops.h"
drivers/video/wm8505fb.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include <linux/platform_device.h>
#include <linux/wait.h>
#include <mach/vt8500fb.h>
#include <linux/platform_data/video-vt8500lcdfb.h>
#include "wm8505fb_regs.h"
#include "wmt_ge_rops.h"