diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:25:41 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:25:41 +0100 |
| commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch) | |
| tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-orion5x/kurobox_pro-setup.c | |
| parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff) | |
| parent | 5839fec9d8db35b2b07359b18a77295418e239ad (diff) | |
| download | blackbird-op-linux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.tar.gz blackbird-op-linux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.zip | |
Merge branch 'next/fixes' into next/cleanup
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-orion5x/kurobox_pro-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index 9115511dc035..d3cd3f63258a 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c @@ -7,7 +7,7 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> @@ -21,7 +21,6 @@ #include <linux/serial_reg.h> #include <linux/ata_platform.h> #include <asm/mach-types.h> -#include <asm/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h> |
