On Mon, Nov 25, 2013 at 09:55:25AM +0100, Geert Uytterhoeven wrote:
> The extra definition for BITS_PER_LONG is also indirectly provided
> by <asm-generic/types.h>, via <asm-generic/int-ll64.h> and
> <asm/bitsperlong.h>
>
> Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> Cc: Mikael Starvik <starvik@xxxxxxxx>
Acked-by: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
> Cc: linux-cris-kernel@xxxxxxxx
> ---
> arch/cris/include/asm/Kbuild | 1 +
> arch/cris/include/asm/types.h | 12 ------------
> 2 files changed, 1 insertion(+), 12 deletions(-)
> delete mode 100644 arch/cris/include/asm/types.h
>
> diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
> index 44e7d0dbcf32..2433df443890 100644
> --- a/arch/cris/include/asm/Kbuild
> +++ b/arch/cris/include/asm/Kbuild
> @@ -13,3 +13,4 @@ generic-y += trace_clock.h
> generic-y += vga.h
> generic-y += xor.h
> generic-y += preempt.h
> +generic-y += types.h
> diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h
> deleted file mode 100644
> index a3cac7757c7f..000000000000
> --- a/arch/cris/include/asm/types.h
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -#ifndef _ETRAX_TYPES_H
> -#define _ETRAX_TYPES_H
> -
> -#include <uapi/asm/types.h>
> -
> -/*
> - * These aren't exported outside the kernel to avoid name space clashes
> - */
> -
> -#define BITS_PER_LONG 32
> -
> -#endif
> --
> 1.7.9.5
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@xxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
