aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/68000/bootlogo.h
diff options
context:
space:
mode:
authorGideon Israel Dsouza <gidisrael@gmail.com>2017-02-24 15:00:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-24 17:46:56 -0800
commit849de0cd2c873c878fc2605156f10a8ade9bde28 (patch)
treea9aedf5ef9a4a7c03ae781f61805e2e3260dd953 /arch/m68k/68000/bootlogo.h
parentcompiler-gcc.h: add a new macro to wrap gcc attribute (diff)
downloadlinux-dev-849de0cd2c873c878fc2605156f10a8ade9bde28.tar.xz
linux-dev-849de0cd2c873c878fc2605156f10a8ade9bde28.zip
m68k: replace gcc specific macros with ones from compiler.h
There is <linux/compiler.h> which provides macros for various gcc specific constructs. Eg: __weak for __attribute__((weak)). I've cleaned all instances of gcc specific attributes with the right macros for all files under /arch/m68k Link: http://lkml.kernel.org/r/1485540901-1988-3-git-send-email-gidisrael@gmail.com Signed-off-by: Gideon Israel Dsouza <gidisrael@gmail.com> Cc: Greg Ungerer <gerg@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/68000/bootlogo.h')
-rw-r--r--arch/m68k/68000/bootlogo.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/68000/bootlogo.h b/arch/m68k/68000/bootlogo.h
index b896c933fafc..c466db3ca3a8 100644
--- a/arch/m68k/68000/bootlogo.h
+++ b/arch/m68k/68000/bootlogo.h
@@ -1,6 +1,8 @@
+#include <linux/compiler.h>
+
#define bootlogo_width 160
#define bootlogo_height 160
-unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {
+unsigned char __aligned(16) bootlogo_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,