Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

Some manual fixups for clashing kfree() cleanups etc.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mtd/maps/ebony.c b/drivers/mtd/maps/ebony.c
index b9d9cf4854b6..c0daf58357ca 100644
--- a/drivers/mtd/maps/ebony.c
+++ b/drivers/mtd/maps/ebony.c
@@ -1,6 +1,6 @@
 /*
- * $Id: ebony.c,v 1.15 2004/12/09 18:39:54 holindho Exp $
- * 
+ * $Id: ebony.c,v 1.16 2005/11/07 11:14:26 gleixner Exp $
+ *
  * Mapping for Ebony user flash
  *
  * Matt Porter <mporter@kernel.crashing.org>
@@ -85,7 +85,7 @@ int __init init_ebony(void)
                 small_flash_base = EBONY_SMALL_FLASH_LOW2;
         else
                 small_flash_base = EBONY_SMALL_FLASH_LOW1;
-                        
+
         if (EBONY_BOOT_SMALL_FLASH(fpga0_reg) &&
                         !EBONY_ONBRD_FLASH_EN(fpga0_reg))
                 large_flash_base = EBONY_LARGE_FLASH_LOW;