diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-08 12:51:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-08 12:51:47 -0500 |
| commit | 2f4c9de3d00b09f74eaf9598ea4edbbc4f99b62d (patch) | |
| tree | 253415eae65bc1685bb8722dbd38b0697e7aa7b8 /drivers/gpio/mxc_gpio.c | |
| parent | 5e2338079d4497fe87db60b791203e760493780c (diff) | |
| parent | ca9d211e2c7801bc3e194d325ece0d3b583b32d2 (diff) | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'drivers/gpio/mxc_gpio.c')
| -rw-r--r-- | drivers/gpio/mxc_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index c480eba9407..cfa620bceb3 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -47,12 +47,12 @@ static unsigned long gpio_ports[] = { #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ defined(CONFIG_MX7) [4] = GPIO5_BASE_ADDR, -#ifndef CONFIG_MX6UL +#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) [5] = GPIO6_BASE_ADDR, #endif #endif #if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_MX7) -#ifndef CONFIG_MX6UL +#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) [6] = GPIO7_BASE_ADDR, #endif #endif |