diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 03:22:33 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 04:07:21 -0400 |
| commit | e3a66aa33a8f06924f67770e15c22a5c52df314e (patch) | |
| tree | fb8786f1300bdce8f6fc7462e3fd5699e057dd24 /drivers/ata | |
| parent | be2109e13fc6f017040c57615acfe1065723687b (diff) | |
| parent | 6884b680459ab850f99fc37605084187bc9888ac (diff) | |
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>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_ep93xx.c | 2 | ||||
| -rw-r--r-- | drivers/ata/pata_pxa.c | 2 | ||||
| -rw-r--r-- | drivers/ata/pata_samsung_cf.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index 6ef2e3741f76..e056406d6a11 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <linux/dmaengine.h> | 43 | #include <linux/dmaengine.h> |
| 44 | #include <linux/ktime.h> | 44 | #include <linux/ktime.h> |
| 45 | 45 | ||
| 46 | #include <mach/dma.h> | 46 | #include <linux/platform_data/dma-ep93xx.h> |
| 47 | #include <mach/platform.h> | 47 | #include <mach/platform.h> |
| 48 | 48 | ||
| 49 | #define DRV_NAME "ep93xx-ide" | 49 | #define DRV_NAME "ep93xx-ide" |
diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c index 0bb0fb7b26bc..4b8ba559fe24 100644 --- a/drivers/ata/pata_pxa.c +++ b/drivers/ata/pata_pxa.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <scsi/scsi_host.h> | 32 | #include <scsi/scsi_host.h> |
| 33 | 33 | ||
| 34 | #include <mach/pxa2xx-regs.h> | 34 | #include <mach/pxa2xx-regs.h> |
| 35 | #include <mach/pata_pxa.h> | 35 | #include <linux/platform_data/ata-pxa.h> |
| 36 | #include <mach/dma.h> | 36 | #include <mach/dma.h> |
| 37 | 37 | ||
| 38 | #define DRV_NAME "pata_pxa" | 38 | #define DRV_NAME "pata_pxa" |
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index 1b372c297195..63ffb002ec67 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 25 | 25 | ||
| 26 | #include <plat/ata.h> | 26 | #include <linux/platform_data/ata-samsung_cf.h> |
| 27 | #include <plat/regs-ata.h> | 27 | #include <plat/regs-ata.h> |
| 28 | 28 | ||
| 29 | #define DRV_NAME "pata_samsung_cf" | 29 | #define DRV_NAME "pata_samsung_cf" |