[PATCH] m68knommu: use board name defines to differentiate board definitions
authorGreg Ungerer <gerg@snapgear.com>
Wed, 2 Nov 2005 04:56:46 +0000 (14:56 +1000)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:41:19 +0000 (21:41 -0800)
Use board name define to differentiate boards, not combination
of more generic defines.

Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/asm-m68knommu/anchor.h

index 75390e0b40c9b4fc09db32aa63ec054a8139131b..871c0d5cfc3dd4c0a9e811efafa0a5d08e6bce38 100644 (file)
@@ -14,7 +14,7 @@
 /*
  *     Define basic addressing info.
  */
-#if defined(CONFIG_MOTOROLA) && defined(CONFIG_M5407)
+#if defined(CONFIG_M5407C3)
 #define        COMEM_BASE      0xFFFF0000      /* Base of CO-MEM address space */
 #define        COMEM_IRQ       25              /* IRQ of anchor part */
 #else
@@ -96,7 +96,7 @@
  *     The PCI bus will be limited in what slots will actually be used.
  *     Define valid device numbers for different boards.
  */
-#if defined(CONFIG_MOTOROLA) && defined(CONFIG_M5407)
+#if defined(CONFIG_M5407C3)
 #define        COMEM_MINDEV    14              /* Minimum valid DEVICE */
 #define        COMEM_MAXDEV    14              /* Maximum valid DEVICE */
 #define        COMEM_BRIDGEDEV 15              /* Slot bridge is in */