fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / ppc / platforms / 4xx / ibmnp405h.h

diff --git a/arch/ppc/platforms/4xx/ibmnp405h.h b/arch/ppc/platforms/4xx/ibmnp405h.h
index 07a48aa..4aa8821 100644 (file)
--- a/arch/ppc/platforms/4xx/ibmnp405h.h
+++ b/arch/ppc/platforms/4xx/ibmnp405h.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibmnp405h.h
- *
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
@@ -13,7 +11,6 @@
 #ifndef __ASM_IBMNP405H_H__
 #define __ASM_IBMNP405H_H__
 
-#include <linux/config.h>
 
 /* ibm405.h at bottom of this file */
 
@@ -132,8 +129,7 @@
 #define DCRN_UIC1_BASE 0x0D0
 #define DCRN_CPC0_EPRCSR 0x0F3
 
-#define UIC0_UIC1NC      30    /* UIC1 non-critical interrupt */
-#define UIC0_UIC1CR      31    /* UIC1 critical interrupt */
+#define UIC0_UIC1NC    0x00000002
 
 #define CHR1_CETE      0x00000004      /* CPU external timer enable */
 #define UIC0   DCRN_UIC0_BASE
@@ -141,7 +137,6 @@
 
 #undef NR_UICS
 #define NR_UICS        2
-#define UIC_CASCADE_MASK 0x0003        /* bits 30 & 31 */
 
 /* EMAC DCRN's FIXME: armin */
 #define DCRN_MALRXCTP2R(base)  ((base) + 0x42) /* Channel Rx 2 Channel Table Pointer */