summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/solutionengine.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 19:24:08 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 19:24:08 +0100
commitb3ce1debe2685383a9ad6ace9c49869c3968c013 (patch)
treedcb606fac467d6ce78a9c608a1e0d2323af44f2b /drivers/mtd/maps/solutionengine.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial (diff)
parent[MTD] chips: Clean up trailing white spaces (diff)
downloadlinux-b3ce1debe2685383a9ad6ace9c49869c3968c013.tar.xz
linux-b3ce1debe2685383a9ad6ace9c49869c3968c013.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Some manual fixups for clashing kfree() cleanups etc.
Diffstat (limited to 'drivers/mtd/maps/solutionengine.c')
-rw-r--r--drivers/mtd/maps/solutionengine.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c
index 8ce5d897645c..c53c2c369c9d 100644
--- a/drivers/mtd/maps/solutionengine.c
+++ b/drivers/mtd/maps/solutionengine.c
@@ -1,5 +1,5 @@
/*
- * $Id: solutionengine.c,v 1.14 2004/09/16 23:27:14 gleixner Exp $
+ * $Id: solutionengine.c,v 1.15 2005/11/07 11:14:28 gleixner Exp $
*
* Flash and EPROM on Hitachi Solution Engine and similar boards.
*
@@ -67,7 +67,7 @@ static int __init init_soleng_maps(void)
soleng_eprom_map.virt = (void __iomem *)P1SEGADDR(0x01000000);
simple_map_init(&soleng_eprom_map);
simple_map_init(&soleng_flash_map);
-
+
printk(KERN_NOTICE "Probing for flash chips at 0x00000000:\n");
flash_mtd = do_map_probe("cfi_probe", &soleng_flash_map);
if (!flash_mtd) {