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 /arch/arm/mach-pxa/devices.c | |
| 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 'arch/arm/mach-pxa/devices.c')
| -rw-r--r-- | arch/arm/mach-pxa/devices.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index adf32e61f451..ddaa04de8e22 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
| @@ -7,17 +7,17 @@ | |||
| 7 | #include <linux/i2c/pxa-i2c.h> | 7 | #include <linux/i2c/pxa-i2c.h> |
| 8 | 8 | ||
| 9 | #include <mach/udc.h> | 9 | #include <mach/udc.h> |
| 10 | #include <mach/pxa3xx-u2d.h> | 10 | #include <linux/platform_data/usb-pxa3xx-ulpi.h> |
| 11 | #include <mach/pxafb.h> | 11 | #include <linux/platform_data/video-pxafb.h> |
| 12 | #include <mach/mmc.h> | 12 | #include <linux/platform_data/mmc-pxamci.h> |
| 13 | #include <mach/irda.h> | 13 | #include <linux/platform_data/irda-pxaficp.h> |
| 14 | #include <mach/irqs.h> | 14 | #include <mach/irqs.h> |
| 15 | #include <mach/ohci.h> | 15 | #include <linux/platform_data/usb-ohci-pxa27x.h> |
| 16 | #include <plat/pxa27x_keypad.h> | 16 | #include <linux/platform_data/keypad-pxa27x.h> |
| 17 | #include <mach/camera.h> | 17 | #include <linux/platform_data/camera-pxa.h> |
| 18 | #include <mach/audio.h> | 18 | #include <mach/audio.h> |
| 19 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
| 20 | #include <plat/pxa3xx_nand.h> | 20 | #include <linux/platform_data/mtd-nand-pxa3xx.h> |
| 21 | 21 | ||
| 22 | #include "devices.h" | 22 | #include "devices.h" |
| 23 | #include "generic.h" | 23 | #include "generic.h" |