diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:32:05 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:32:05 -0400 |
| commit | eabe7b01c249c9d8166a1a10bb6effce2b3de665 (patch) | |
| tree | 31f1ca0c0f6d027839d3d5915cf890400a52168a /arch/arm/mach-pxa/raumfeld.c | |
| parent | c421a1e418b191c8fb632dc5261b61acec6541ca (diff) | |
| parent | 436d42c61c3eef1d02256174c8615046c61a28ad (diff) | |
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
Diffstat (limited to 'arch/arm/mach-pxa/raumfeld.c')
| -rw-r--r-- | arch/arm/mach-pxa/raumfeld.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index d89d87ae144c..25b08bfa997b 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c | |||
| @@ -49,10 +49,10 @@ | |||
| 49 | #include <asm/mach/arch.h> | 49 | #include <asm/mach/arch.h> |
| 50 | 50 | ||
| 51 | #include <mach/pxa300.h> | 51 | #include <mach/pxa300.h> |
| 52 | #include <mach/ohci.h> | 52 | #include <linux/platform_data/usb-ohci-pxa27x.h> |
| 53 | #include <mach/pxafb.h> | 53 | #include <linux/platform_data/video-pxafb.h> |
| 54 | #include <mach/mmc.h> | 54 | #include <linux/platform_data/mmc-pxamci.h> |
| 55 | #include <plat/pxa3xx_nand.h> | 55 | #include <linux/platform_data/mtd-nand-pxa3xx.h> |
| 56 | 56 | ||
| 57 | #include "generic.h" | 57 | #include "generic.h" |
| 58 | #include "devices.h" | 58 | #include "devices.h" |