diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-03-21 14:22:43 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-04-16 15:11:04 +1000 |
| commit | 89d786011fcbc89eedca8b6bf9b7c11bbbde350a (patch) | |
| tree | d0d6b791c7617d274396fbff539293d1999a10a3 /arch/m68k | |
| parent | acb0c7accde75f75afc70f662d045827d5126839 (diff) | |
| download | linux-3.10-89d786011fcbc89eedca8b6bf9b7c11bbbde350a.tar.gz linux-3.10-89d786011fcbc89eedca8b6bf9b7c11bbbde350a.tar.bz2 linux-3.10-89d786011fcbc89eedca8b6bf9b7c11bbbde350a.zip | |
m68knommu: move and fix the 68VZ328 platform bootlogo.h
The 68EZ328/bootlogo.h is not actually used in the 68EZ328 platform code
at all. It is used by the 68VZ328 platform code though, so move it to be
with the rest of the 68VZ328 platform code.
Commit c0e0c89c089f4bd66dbbd1a44da90abe74fe3f02 ("fix broken boot logo
inclusion") modified the bootlogo code to not be included in asm code.
Modify 68VZ328/bootlogo.h so that the bootlogo bit map is named correctly
for direct use in the C code.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/platform/68VZ328/bootlogo.h (renamed from arch/m68k/platform/68EZ328/bootlogo.h) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/platform/68EZ328/bootlogo.h b/arch/m68k/platform/68VZ328/bootlogo.h index e842bdae583..b38e2b25514 100644 --- a/arch/m68k/platform/68EZ328/bootlogo.h +++ b/arch/m68k/platform/68VZ328/bootlogo.h @@ -1,6 +1,6 @@ #define splash_width 640 #define splash_height 480 -static unsigned char splash_bits[] = { +unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |