Merge by hand (whitespace conflicts in libata.h)

[powerpc.git] / drivers / mtd / maps / physmap.c

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index b853670..9ee760f 100644 (file)
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: physmap.c,v 1.37 2004/11/28 09:40:40 dwmw2 Exp $
+ * $Id: physmap.c,v 1.38 2005/11/07 11:14:28 gleixner Exp $
  *
  * Normal mappings of chips in physical memory
  *
@@ -69,7 +69,7 @@ static int __init init_physmap(void)
                mymtd->owner = THIS_MODULE;
 
 #ifdef CONFIG_MTD_PARTITIONS
-               mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes, 
+               mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes,
                                                    &mtd_parts, 0);
 
                if (mtd_parts_nb > 0)
@@ -78,9 +78,9 @@ static int __init init_physmap(void)
                        return 0;
                }
 
-               if (num_physmap_partitions != 0) 
+               if (num_physmap_partitions != 0)
                {
-                       printk(KERN_NOTICE 
+                       printk(KERN_NOTICE
                               "Using physmap partition definition\n");
                        add_mtd_partitions (mymtd, physmap_partitions, num_physmap_partitions);
                        return 0;