diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-03 12:00:35 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-03 12:00:35 -0600 |
| commit | 8c68010a7bf2d234e985d90cd0f68b63983763e5 (patch) | |
| tree | d28e3bb0e6a75f468e9e95879b0384c2f7b9d883 /nuttx | |
| parent | ceab5fec9ede748feb9fd91a200b3c8937751262 (diff) | |
| parent | 7d1d964e9691b5d98ed61f08cac61c44f5ba80cb (diff) | |
| download | px4-nuttx-8c68010a7bf2d234e985d90cd0f68b63983763e5.tar.gz px4-nuttx-8c68010a7bf2d234e985d90cd0f68b63983763e5.tar.bz2 px4-nuttx-8c68010a7bf2d234e985d90cd0f68b63983763e5.zip | |
Merge remote-tracking branch 'origin/master' into bas24
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/sam34/chip/sam4e_pinmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/sam34/chip/sam4e_pinmap.h b/nuttx/arch/arm/src/sam34/chip/sam4e_pinmap.h index 219e62aa1..7fc2bfd7e 100644 --- a/nuttx/arch/arm/src/sam34/chip/sam4e_pinmap.h +++ b/nuttx/arch/arm/src/sam34/chip/sam4e_pinmap.h @@ -267,7 +267,7 @@ #define GPIO_TC7_TIOB (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | GPIO_PIN9) #define GPIO_TC8_TCLK (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | GPIO_PIN14) #define GPIO_TC8_TIOA (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | GPIO_PIN11) -#define GPIO_TC8_TIOB (GPIO_PERIPHB | GGPIO_CFG_DEFAULT | PIO_PORT_PIOC | GPIO_PIN12) +#define GPIO_TC8_TIOB (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | GPIO_PIN12) /* Two Wire Interface (TWI) */ |