diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-20 12:36:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-20 12:39:16 -0500 |
| commit | a3e1653ddeb02f39481eba572275016171e9670c (patch) | |
| tree | ab620de093377355ef863ecfe4e1bfda9a9129c8 /arch/mips/include | |
| parent | e070dc422d98cd232a928ceba87ac448854b8f25 (diff) | |
| parent | 5bbf36af7ff6f4ff77d903320e95e5628c68884d (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Clearfog GT-8K support added by Baruch / Raheeb
- const and sizes cleanup (also in MIPS) from Baruch
- Minor cleanup to db-88f6820 from Chris
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | arch/mips/include/asm/const.h | 27 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-generic/spaces.h | 2 |
2 files changed, 1 insertions, 28 deletions
diff --git a/arch/mips/include/asm/const.h b/arch/mips/include/asm/const.h deleted file mode 100644 index ed43b5d534..0000000000 --- a/arch/mips/include/asm/const.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * const.h: Macros for dealing with constants. - */ - -#ifndef _LINUX_CONST_H -#define _LINUX_CONST_H - -/* Some constant macros are used in both assembler and - * C code. Therefore we cannot annotate them always with - * 'UL' and other type specifiers unilaterally. We - * use the following macros to deal with this. - * - * Similarly, _AT() will cast an expression with a type in C, but - * leave it unchanged in asm. - */ - -#ifdef __ASSEMBLY__ -#define _AT(T,X) X -#else -#define _AT(T,X) ((T)(X)) -#endif - -#define _BITUL(x) (_AC(1,UL) << (x)) -#define _BITULL(x) (_AC(1,ULL) << (x)) - -#endif /* !(_LINUX_CONST_H) */ diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index b7eac323cd..539d0a566d 100644 --- a/arch/mips/include/asm/mach-generic/spaces.h +++ b/arch/mips/include/asm/mach-generic/spaces.h @@ -7,7 +7,7 @@ #ifndef _ASM_MACH_GENERIC_SPACES_H #define _ASM_MACH_GENERIC_SPACES_H -#include <asm/const.h> +#include <linux/const.h> /* * This gives the physical RAM offset. |