forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/include/linux/platform_data
History
Olof Johansson e3a66aa33a 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>
2012-09-22 01:07:21 -07:00
..
ad7266.h iio:adc: Add AD7265/AD7266 support 2012-06-30 10:15:07 +01:00
asoc-imx-ssi.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
asoc-kirkwood.h ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
asoc-palm27x.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
asoc-s3c.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
asoc-s3c24xx_simtec.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
asoc-ti-mcbsp.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
at91_adc.h
ata-pxa.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
ata-samsung_cf.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
atmel-aes.h ARM: at91: move platform_data definitions 2012-09-14 11:16:40 +02:00
atmel.h
camera-mx1.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
camera-mx2.h Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
camera-mx3.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
camera-pxa.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
clk-integrator.h ARM: integrator: convert to common clock 2012-07-11 17:58:45 -07:00
clk-nomadik.h ARM: nomadik: convert to generic clock 2012-06-10 18:41:40 +02:00
clk-realview.h clk: convert ARM RealView to common clk 2012-08-24 17:42:10 -07:00
clk-u300.h ARM: u300: convert to common clock 2012-07-11 15:36:45 -07:00
clk-ux500.h clk: ux500: First version of clock definitions for ux500 2012-09-06 15:58:04 -07:00
cpsw.h
crypto-ux500.h ARM: nomadik: move platform_data definitions 2012-09-14 11:19:00 +02:00
dma-atmel.h ARM: at91: move platform_data definitions 2012-09-14 11:16:40 +02:00
dma-ep93xx.h ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
dma-imx-sdma.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
dma-imx.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
dma-mmp_tdma.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
dma-mv_xor.h ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
dsp-omap.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
dwc3-exynos.h
dwc3-omap.h
efm32-uart.h
ehci-sh.h
emif_plat.h
eth-netx.h ARM: netx: move platform_data definitions 2012-09-14 11:17:36 +02:00
exynos4_tmu.h
fsa9480.h
gpio-em.h
gpio-omap.h ARM: OMAP: Move gpio.h to include/linux/platform_data 2012-09-12 18:06:30 -07:00
hwmon-s3c.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
i2c-davinci.h ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
i2c-imx.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
i2c-nomadik.h i2c-nomadik: move header to <linux/platform_data/i2c-nomadik.h> 2012-07-09 11:40:40 +02:00
i2c-nuc900.h ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
i2c-s3c2410.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
ina2xx.h
irda-pxaficp.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
keyboard-pxa930_rotary.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
keyboard-spear.h ARM: spear: move platform_data definitions 2012-09-19 17:42:19 +02:00
keypad-ep93xx.h ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
keypad-nomadik-ske.h ARM: nomadik: move platform_data definitions 2012-09-14 11:19:00 +02:00
keypad-omap.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
keypad-pxa27x.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
keypad-w90p910.h ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
keyscan-davinci.h ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
lcd-mipid.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
leds-kirkwood-netxbig.h ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
leds-kirkwood-ns2.h ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
leds-lm3556.h leds: Add LED driver for lm3556 chip 2012-07-24 07:52:35 +08:00
leds-renesas-tpu.h
leds-s3c24xx.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
lp855x.h backlight: move lp855x header into platform_data directory 2012-07-30 17:25:15 -07:00
lp8727.h lp8727_charger: Move header file into platform_data directory 2012-07-14 01:14:35 -07:00
macb.h
max310x.h serial: New serial driver MAX310X 2012-08-16 12:12:25 -07:00
mfd-mcp-sa11x0.h ARM: sa1100: move platform_data definitions 2012-09-14 11:18:57 +02:00
mipi-csis.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mmc-davinci.h ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
mmc-esdhc-imx.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mmc-msm_sdcc.h ARM: msm: move platform_data definitions 2012-09-14 11:17:35 +02:00
mmc-mvsdio.h ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
mmc-mxcmmc.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mmc-pxamci.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
mmc-s3cmci.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mmc-sdhci-tegra.h ARM: tegra: move sdhci platform_data definition 2012-09-14 11:18:57 +02:00
mmp_audio.h ASoC: mmp: add audio dma support 2012-06-13 13:13:37 +01:00
mouse-pxa930_trkball.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
msm_serial_hs.h
mtd-davinci-aemif.h ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
mtd-davinci.h ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
mtd-mxc_nand.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mtd-nand-omap2.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
mtd-nand-pxa3xx.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
mtd-nand-s3c2410.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mtd-nomadik-nand.h ARM: nomadik: move platform_data definitions 2012-09-14 11:19:00 +02:00
mtd-onenand-omap2.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
mtd-orion_nand.h ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
mv_usb.h usb/marvell: remove conditional compilation of clk code 2012-07-30 17:25:12 -07:00
ntc_thermistor.h
omap-abe-twl6040.h
omap1_bl.h ARM: OMAP1: move omap1_bl pdata out of arch/arm/* 2012-09-10 16:34:00 -07:00
omap4-keypad.h
omap_drm.h omap2+: add drm device 2012-07-02 04:05:57 -07:00
pcmcia-pxa2xx_viper.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pinctrl-coh901.h pinctrl/coh901: move header to platform data dir 2012-08-13 13:53:05 +02:00
pxa_sdhci.h
remoteproc-omap.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
s3c-hsotg.h usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h 2012-07-17 10:54:29 -07:00
s3c-hsudc.h
sccnxp.h serial: New serial driver SCCNXP 2012-09-05 13:21:46 -07:00
serial-imx.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
spi-davinci.h ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
spi-ep93xx.h ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
spi-imx.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
spi-nuc900.h ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
spi-omap2-mcspi.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
spi-s3c64xx.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
tegra_emc.h
tegra_usb.h
touchscreen-s3c2410.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
uio_pruss.h
usb-davinci.h ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
usb-ehci-mxc.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
usb-ehci-orion.h ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
usb-ehci-s5p.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
usb-exynos.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
usb-imx_udc.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
usb-musb-ux500.h ARM: nomadik: move platform_data definitions 2012-09-14 11:19:00 +02:00
usb-mx2.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
usb-ohci-pxa27x.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
usb-ohci-s3c2410.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
usb-pxa3xx-ulpi.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
usb-s3c2410_udc.h ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
video-ep93xx.h ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
video-imxfb.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
video-msm_fb.h ARM: msm: move platform_data definitions 2012-09-14 11:17:35 +02:00
video-mx3fb.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
video-nuc900fb.h ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
video-pxafb.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
video-vt8500lcdfb.h ARM: vt8500: move platform_data definitions 2012-09-14 11:18:58 +02:00
voltage-omap.h ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
wiznet.h