Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-03 15:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into mcan

Browse source
This commit is contained in:
Gregory Nutt 2015-07-31 10:14:42 -06:00
commit 70f6e1e8bb
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/src/samv7/chip/sam_emac.h
View file

@ -36,8 +36,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMAC_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMAC_H
#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EMAC_H
#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EMAC_H
/************************************************************************************
* Included Files
@ -1043,4 +1043,4 @@ struct emac_txdesc_s
};
#endif /* SAMV7_NEMAC > 0 */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMAC_H */
#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EMAC_H */