summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-13 13:11:09 -0500
committerTom Rini <trini@ti.com>2015-02-13 13:11:09 -0500
commit757566d1567a98f5c331c14f088001dbfe187191 (patch)
tree86c9ab53fbefee672f37165f51db398338bf9968 /arch/arm/include
parentc445506d73a0fba6472d12510b2d41148f078349 (diff)
parentb1f6659c420dae9cd06514fbd8342f39b3f326b9 (diff)
downloadu-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.zip
u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.tar.gz
u-boot-imx-757566d1567a98f5c331c14f088001dbfe187191.tar.bz2
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch-at91/at91_pio.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h
index 50464ff..3012278 100644
--- a/arch/arm/include/asm/arch-at91/at91_pio.h
+++ b/arch/arm/include/asm/arch-at91/at91_pio.h
@@ -114,14 +114,10 @@ typedef union at91_pio {
at91_port_t pioa;
at91_port_t piob;
at91_port_t pioc;
- #if (ATMEL_PIO_PORTS > 3)
- at91_port_t piod;
- #endif
- #if (ATMEL_PIO_PORTS > 4)
- at91_port_t pioe;
- #endif
- } ;
- at91_port_t port[ATMEL_PIO_PORTS];
+ at91_port_t piod; /* not present in all hardware */
+ at91_port_t pioe;/* not present in all hardware */
+ };
+ at91_port_t port[5];
} at91_pio_t;
#ifdef CONFIG_AT91_GPIO