summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-am33xx/cpu.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-10-14 10:46:36 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-10-14 10:46:36 +0200
commit13a3972585af60ec367d209cedbd3601e0c77467 (patch)
tree4b3312669b3e501f6bc10b39d8c7bbf516f07aac /arch/arm/include/asm/arch-am33xx/cpu.h
parent208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff)
parent297faccca2235e359012118495b9b73451d54bb9 (diff)
downloadu-boot-imx-13a3972585af60ec367d209cedbd3601e0c77467.zip
u-boot-imx-13a3972585af60ec367d209cedbd3601e0c77467.tar.gz
u-boot-imx-13a3972585af60ec367d209cedbd3601e0c77467.tar.bz2
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'arch/arm/include/asm/arch-am33xx/cpu.h')
-rw-r--r--arch/arm/include/asm/arch-am33xx/cpu.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
index 13a9cad..112ac5e 100644
--- a/arch/arm/include/asm/arch-am33xx/cpu.h
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -17,7 +17,6 @@
#include <asm/arch/hardware.h>
-#define BIT(x) (1 << x)
#define CL_BIT(x) (0 << x)
/* Timer register bits */