Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eabe7b01 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'samsung_platform_data' into staging/for_v3.7 

* samsung_platform_data:
  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
parents c421a1e4 436d42c6

Documentation/spi/ep93xx_spi

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ arch/arm/mach-ep93xx/ts72xx.c: 
#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>





#include <mach/ep93xx_spi.h>

#include <linux/platform_data/spi-ep93xx.h>





/* this is our GPIO line used for chip select */

/* this is our GPIO line used for chip select */

#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9

#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9

arch/arm/mach-at91/at91sam9g45_devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <mach/at91sam9g45_matrix.h>

#include <mach/at91sam9g45_matrix.h>

#include <mach/at91_matrix.h>

#include <mach/at91_matrix.h>

#include <mach/at91sam9_smc.h>

#include <mach/at91sam9_smc.h>

#include <mach/at_hdmac.h>

#include <linux/platform_data/dma-atmel.h>

#include <mach/atmel-mci.h>

#include <mach/atmel-mci.h>





#include <media/atmel-isi.h>

#include <media/atmel-isi.h>

arch/arm/mach-at91/at91sam9rl_devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <mach/at91sam9rl_matrix.h>

#include <mach/at91sam9rl_matrix.h>

#include <mach/at91_matrix.h>

#include <mach/at91_matrix.h>

#include <mach/at91sam9_smc.h>

#include <mach/at91sam9_smc.h>

#include <mach/at_hdmac.h>

#include <linux/platform_data/dma-atmel.h>





#include "generic.h"

#include "generic.h"

arch/arm/mach-at91/include/mach/atmel-mci.h

+1 −1
Original line number Original line Diff line number Diff line 
#ifndef __MACH_ATMEL_MCI_H

#ifndef __MACH_ATMEL_MCI_H

#define __MACH_ATMEL_MCI_H

#define __MACH_ATMEL_MCI_H





#include <mach/at_hdmac.h>

#include <linux/platform_data/dma-atmel.h>





/**

/**

 * struct mci_dma_data - DMA data for MCI interface

 * struct mci_dma_data - DMA data for MCI interface

arch/arm/mach-davinci/aemif.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/time.h>

#include <linux/time.h>





#include <mach/aemif.h>

#include <linux/platform_data/mtd-davinci-aemif.h>





/* Timing value configuration */

/* Timing value configuration */