power_supply: add CHARGE_COUNTER property and olpc_battery support for it

[safe/jmp/linux-2.6] / include / asm-m68knommu / mcfsim.h

diff --git a/include/asm-m68knommu/mcfsim.h b/include/asm-m68knommu/mcfsim.h
index 97a0c27..da3f2ce 100644 (file)
--- a/include/asm-m68knommu/mcfsim.h
+++ b/include/asm-m68knommu/mcfsim.h
@@ -17,9 +17,7 @@
  *     Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282,
  *     5307 or 5407 specific addresses.
  */
-#if defined(CONFIG_M5204)
-#include <asm/m5204sim.h>
-#elif defined(CONFIG_M5206) || defined(CONFIG_M5206e)
+#if defined(CONFIG_M5206) || defined(CONFIG_M5206e)
 #include <asm/m5206sim.h>
 #elif defined(CONFIG_M520x)
 #include <asm/m520xsim.h>
@@ -35,6 +33,8 @@
 #include <asm/m528xsim.h>
 #elif defined(CONFIG_M5307)
 #include <asm/m5307sim.h>
+#elif defined(CONFIG_M532x)
+#include <asm/m532xsim.h>
 #elif defined(CONFIG_M5407)
 #include <asm/m5407sim.h>
 #endif
@@ -100,6 +100,7 @@
 #define        MCFSIM_IMR_MASKALL      0x3ffe          /* All intr sources */
 #endif
 
+
 /*
  *     PIT interrupt settings, if not found in mXXXXsim.h file.
  */