[ARM] Tidy patch 1221/1: merge H3800 ifdef with graphicsmaster ifdef

9257dd56 · Russell King · d741b431 · 9257dd56
Commit 9257dd56 authored Aug 03, 2002 by Russell King
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

include/asm-arm/arch-sa1100/irqs.h include/asm-arm/arch-sa1100/irqs.h +2 -3

No files found.
--- a/include/asm-arm/arch-sa1100/irqs.h
+++ b/include/asm-arm/arch-sa1100/irqs.h
@@ -131,9 +131,8 @@
 #ifdef CONFIG_SA1111
 #define NR_IRQS			(S1_BVD1_STSCHG + 1)
 #elif defined(CONFIG_SA1100_GRAPHICSCLIENT) || \
-      defined(CONFIG_SA1100_GRAPHICSMASTER)
+      defined(CONFIG_SA1100_GRAPHICSMASTER) || \
-#define NR_IRQS			(IRQ_BOARD_END)
+      defined(CONFIG_SA1100_H3800)
-#elif defined(CONFIG_SA1100_H3800)
 #define NR_IRQS			(IRQ_BOARD_END)
 #else
 #define NR_IRQS			(IRQ_BOARD_START)