[09/10] ux500: Addressing irq header file dependency for snowball.

From: Mathieu J. Poirier <mathieu.poirier@linaro.org>

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 arch/arm/mach-ux500/include/mach/irqs.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

On Saturday 12 March 2011 00:08:11 mathieu.poirier@linaro.org wrote:
> --- a/arch/arm/mach-ux500/include/mach/irqs.h
> +++ b/arch/arm/mach-ux500/include/mach/irqs.h
> @@ -36,7 +36,7 @@
>  /* This will be overridden by board-specific irq headers */
>  #define IRQ_BOARD_END                  IRQ_BOARD_START
>  
> -#ifdef CONFIG_MACH_U8500
> +#if defined CONFIG_MACH_U8500 || CONFIG_MACH_U8500_SNOWBALL
>  #include <mach/irqs-board-mop500.h>
>  #endif

Can't you just remove the #ifdef entirely? If you want to
be able to build a common kernel, these build-time conditionals
don't work anyway, so the irqs-* files need to be distinct.

The other option would be to remove the #include and directly
include the board specific irqs header from the board file.

In either case, the change would belong in the same patch as
the code that requires it. Just add a short notice about it
in the changelog.

	Arnd

On Sat, Mar 12, 2011 at 11:05 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Saturday 12 March 2011 00:08:11 mathieu.poirier@linaro.org wrote:
>> --- a/arch/arm/mach-ux500/include/mach/irqs.h
>> +++ b/arch/arm/mach-ux500/include/mach/irqs.h
>> @@ -36,7 +36,7 @@
>>  /* This will be overridden by board-specific irq headers */
>>  #define IRQ_BOARD_END                  IRQ_BOARD_START
>>
>> -#ifdef CONFIG_MACH_U8500
>> +#if defined CONFIG_MACH_U8500 || CONFIG_MACH_U8500_SNOWBALL
>>  #include <mach/irqs-board-mop500.h>
>>  #endif
>
> Can't you just remove the #ifdef entirely?

Not only that I think, but merge the entire mach/irqs.h into
irqs-board-mop500.h and get rid of mach/irqs.h altogether is the
proper thing to do. The mach/irqs.h only consider that board
family anyway.

There is no reason why we should be broadcasting a few
board-specific irq defines to the entire kernel in mach/

(Surely I can also patch that up later if need be, though,
note to self.)

Yours,
Linus Walleij