linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / mtd / maps / dilnetpc.c

diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c
index b1104fe..b51c757 100644 (file)
--- a/drivers/mtd/maps/dilnetpc.c
+++ b/drivers/mtd/maps/dilnetpc.c
@@ -25,6 +25,7 @@
  * and http://www.ssv-embedded.de/ssv/pc104/p170.htm
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -217,8 +218,8 @@ static void dnp_set_vpp(struct map_info *not_used, int on)
        {
                if(--vpp_counter == 0)
                        setcsc(CSC_RBWR, getcsc(CSC_RBWR) | 0x4);
-               else
-                       BUG_ON(vpp_counter < 0);
+               else if(vpp_counter < 0)
+                       BUG();
        }
        spin_unlock_irq(&dnpc_spin);
 }
@@ -239,8 +240,8 @@ static void adnp_set_vpp(struct map_info *not_used, int on)
        {
                if(--vpp_counter == 0)
                        setcsc(CSC_RBWR, getcsc(CSC_RBWR) | 0x8);
-               else
-                       BUG_ON(vpp_counter < 0);
+               else if(vpp_counter < 0)
+                       BUG();
        }
        spin_unlock_irq(&dnpc_spin);
 }
@@ -299,7 +300,7 @@ static struct mtd_partition partition_info[]=
        },
 };
 
-#define NUM_PARTITIONS ARRAY_SIZE(partition_info)
+#define NUM_PARTITIONS (sizeof(partition_info)/sizeof(partition_info[0]))
 
 static struct mtd_info *mymtd;
 static struct mtd_info *lowlvl_parts[NUM_PARTITIONS];
@@ -344,7 +345,7 @@ static struct mtd_partition higlvl_partition_info[]=
        },
 };
 
-#define NUM_HIGHLVL_PARTITIONS ARRAY_SIZE(higlvl_partition_info)
+#define NUM_HIGHLVL_PARTITIONS (sizeof(higlvl_partition_info)/sizeof(partition_info[0]))
 
 
 static int dnp_adnp_probe(void)