Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[powerpc.git] / include / asm-m68knommu / mcfsim.h

diff --git a/include/asm-m68knommu/mcfsim.h b/include/asm-m68knommu/mcfsim.h
index b0c7736..97a0c27 100644 (file)
--- a/include/asm-m68knommu/mcfsim.h
+++ b/include/asm-m68knommu/mcfsim.h
@@ -12,7 +12,6 @@
 #define        mcfsim_h
 /****************************************************************************/
 
-#include <linux/config.h>
 
 /*
  *     Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282,
@@ -22,6 +21,8 @@
 #include <asm/m5204sim.h>
 #elif defined(CONFIG_M5206) || defined(CONFIG_M5206e)
 #include <asm/m5206sim.h>
+#elif defined(CONFIG_M520x)
+#include <asm/m520xsim.h>
 #elif defined(CONFIG_M523x)
 #include <asm/m523xsim.h>
 #elif defined(CONFIG_M5249)
@@ -99,6 +100,19 @@
 #define        MCFSIM_IMR_MASKALL      0x3ffe          /* All intr sources */
 #endif
 
+/*
+ *     PIT interrupt settings, if not found in mXXXXsim.h file.
+ */
+#ifndef        ICR_INTRCONF
+#define        ICR_INTRCONF            0x2b            /* PIT1 level 5, priority 3 */
+#endif
+#ifndef        MCFPIT_IMR
+#define        MCFPIT_IMR              MCFINTC_IMRH
+#endif
+#ifndef        MCFPIT_IMR_IBIT
+#define        MCFPIT_IMR_IBIT         (1 << (MCFINT_PIT1 - 32))
+#endif
+
 
 #ifndef __ASSEMBLY__
 /*