diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-01-25 21:46:21 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-01-25 21:46:21 +0300 |
| commit | 7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch) | |
| tree | cd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /arch/arm/mach-pxa/devices.c | |
| parent | 143c6fe3a415edf2dde3f507b3a00998b4c4001e (diff) | |
| parent | 20437f79f6627a31752f422688a6047c25cefcf1 (diff) | |
| download | linux-7e3b1207705c10ada363bbc7d0235730ce1f5b79.tar.xz | |
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'arch/arm/mach-pxa/devices.c')
| -rw-r--r-- | arch/arm/mach-pxa/devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 2a6e0ae2b920..37d8d85662f0 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -6,7 +6,7 @@ #include <linux/spi/pxa2xx_spi.h> #include <linux/i2c/pxa-i2c.h> -#include <mach/udc.h> +#include "udc.h" #include <linux/platform_data/usb-pxa3xx-ulpi.h> #include <linux/platform_data/video-pxafb.h> #include <linux/platform_data/mmc-pxamci.h> @@ -14,7 +14,7 @@ #include <mach/irqs.h> #include <linux/platform_data/usb-ohci-pxa27x.h> #include <linux/platform_data/keypad-pxa27x.h> -#include <linux/platform_data/camera-pxa.h> +#include <linux/platform_data/media/camera-pxa.h> #include <mach/audio.h> #include <mach/hardware.h> #include <linux/platform_data/mmp_dma.h> |