Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754859AbbGCJOC (ORCPT ); Fri, 3 Jul 2015 05:14:02 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:36755 "EHLO mail-ob0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754257AbbGCJN4 convert rfc822-to-8bit (ORCPT ); Fri, 3 Jul 2015 05:13:56 -0400 MIME-Version: 1.0 In-Reply-To: <1435912696-17546-2-git-send-email-urs.fassler@bytesatwork.ch> References: <1435912696-17546-1-git-send-email-urs.fassler@bytesatwork.ch> <1435912696-17546-2-git-send-email-urs.fassler@bytesatwork.ch> Date: Fri, 3 Jul 2015 11:13:55 +0200 X-Google-Sender-Auth: rVBGwtepUI-eEoCKjdUi4A5g7T8 Message-ID: Subject: Re: [PATCH 1/3] video/logo: use list of logos to find logo From: Geert Uytterhoeven To: =?UTF-8?B?VXJzIEbDpHNzbGVy?= Cc: Daniel Vetter , Linux Fbdev development list , "linux-kernel@vger.kernel.org" , oliver.staebler@bytesatwork.ch, Jean-Christophe PLAGNIOL-VILLARD , Tomi Valkeinen Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1273 Lines: 32 On Fri, Jul 3, 2015 at 10:38 AM, Urs Fässler wrote: > -#ifdef CONFIG_LOGO_MAC_CLUT224 > - /* Macintosh Linux logo on m68k */ > - if (MACH_IS_MAC) > - logo = &logo_mac_clut224; > +#if defined(CONFIG_LOGO_MAC_CLUT224) && MACH_IS_MAC > + /* Macintosh Linux logo on m68k */ > + &logo_mac_clut224, > #endif That won't work, as depending on kernel configuration, MACH_IS_MAC can be a run-time test, cfr. arch/m68k/include/asm/setup.h:# define MACH_IS_MAC (0) arch/m68k/include/asm/setup.h:# define MACH_IS_MAC (m68k_machtype == MACH_MAC) arch/m68k/include/asm/setup.h:# define MACH_IS_MAC (1) Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/