diff options
Diffstat (limited to 'arch/powerpc/include/asm/arch-mpc85xx/gpio.h')
| -rw-r--r-- | arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h index 76faa22..0c72c71 100644 --- a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h +++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h @@ -14,6 +14,7 @@ #ifndef __ASM_ARCH_MX85XX_GPIO_H #define __ASM_ARCH_MX85XX_GPIO_H +<<<<<<< bc5d0384458466ed5b3608d326eec03cd4f13016 #ifndef CONFIG_MPC85XX_GPIO #include <asm/mpc85xx_gpio.h> #endif @@ -23,5 +24,12 @@ struct mpc85xx_gpio_plat { unsigned long size; uint ngpios; }; +======= +#ifdef CONFIG_MPC8XXX_GPIO +#include <asm/mpc8xxx_gpio.h> +#else +#include <asm/mpc85xx_gpio.h> +#endif +>>>>>>> dm: gpio: Add DM GPIO driver for MPC8xxx platforms #endif |