fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-m68knommu / mcfpit.h

diff --git a/include/asm-m68knommu/mcfpit.h b/include/asm-m68knommu/mcfpit.h
index 76ccfc2..f570cf6 100644 (file)
--- a/include/asm-m68knommu/mcfpit.h
+++ b/include/asm-m68knommu/mcfpit.h
@@ -11,25 +11,26 @@
 #define        mcfpit_h
 /****************************************************************************/
 
-#include <linux/config.h>
 
 /*
- *     Get address specific defines for the 5282.
+ *     Get address specific defines for the 5270/5271, 5280/5282, and 5208.
  */
+#if defined(CONFIG_M520x)
+#define        MCFPIT_BASE1            0x00080000      /* Base address of TIMER1 */
+#define        MCFPIT_BASE2            0x00084000      /* Base address of TIMER2 */
+#else
 #define        MCFPIT_BASE1            0x00150000      /* Base address of TIMER1 */
 #define        MCFPIT_BASE2            0x00160000      /* Base address of TIMER2 */
 #define        MCFPIT_BASE3            0x00170000      /* Base address of TIMER3 */
 #define        MCFPIT_BASE4            0x00180000      /* Base address of TIMER4 */
-
+#endif
 
 /*
  *     Define the PIT timer register set addresses.
  */
-struct mcfpit {
-       unsigned short  pcsr;                   /* PIT control and status */
-       unsigned short  pmr;                    /* PIT modulus register */
-       unsigned short  pcntr;                  /* PIT count register */
-} __attribute__((packed));
+#define        MCFPIT_PCSR             0x0             /* PIT control register */
+#define        MCFPIT_PMR              0x2             /* PIT modulus register */
+#define        MCFPIT_PCNTR            0x4             /* PIT count register */
 
 /*
  *     Bit definitions for the PIT Control and Status register.