diff options
| author | Tom Rini <[email protected]> | 2015-08-24 16:06:03 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-08-24 16:06:03 -0400 |
| commit | 7d31c6ab83d8a5875875eda041c0a1e756189917 (patch) | |
| tree | 4294f1ed6c6dc162940d8a1b79f834879ffbe53a /drivers | |
| parent | a31a415803b8850f52d78395103fca3bdd1d37af (diff) | |
| parent | 3664fa1beec3921dcfed605a9b37f63dee28ce6a (diff) | |
Merge git://git.denx.de/u-boot-pxa
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/pxa_mmc_gen.c | 8 | ||||
| -rw-r--r-- | drivers/serial/serial_pxa.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 5 | ||||
| -rw-r--r-- | drivers/video/pxa_lcd.c | 9 |
4 files changed, 11 insertions, 15 deletions
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index 25ab0b1fc8e..19ae81d470c 100644 --- a/drivers/mmc/pxa_mmc_gen.c +++ b/drivers/mmc/pxa_mmc_gen.c @@ -6,15 +6,13 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include <config.h> #include <common.h> -#include <malloc.h> - -#include <mmc.h> -#include <asm/errno.h> #include <asm/arch/hardware.h> #include <asm/arch/regs-mmc.h> +#include <asm/errno.h> #include <asm/io.h> +#include <malloc.h> +#include <mmc.h> /* PXAMMC Generic default config for various CPUs */ #if defined(CONFIG_CPU_PXA25X) diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index d5140045bfb..8fbcc10248f 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -18,12 +18,12 @@ */ #include <common.h> -#include <watchdog.h> -#include <serial.h> #include <asm/arch/pxa-regs.h> #include <asm/arch/regs-uart.h> #include <asm/io.h> #include <linux/compiler.h> +#include <serial.h> +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 94235552808..c7b21aee421 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -10,11 +10,10 @@ #include <common.h> -#include <config.h> -#include <asm/byteorder.h> -#include <usbdevice.h> #include <asm/arch/hardware.h> +#include <asm/byteorder.h> #include <asm/io.h> +#include <usbdevice.h> #include <usb/pxa27x_udc.h> #include <usb/udc.h> diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c index 64cef37bc9c..2799425a633 100644 --- a/drivers/video/pxa_lcd.c +++ b/drivers/video/pxa_lcd.c @@ -11,14 +11,13 @@ /* ** HEADER FILES */ /************************************************************************/ -#include <config.h> #include <common.h> -#include <stdarg.h> -#include <linux/types.h> -#include <stdio_dev.h> -#include <lcd.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h> +#include <lcd.h> +#include <linux/types.h> +#include <stdarg.h> +#include <stdio_dev.h> /* #define DEBUG */ |