diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/mtd/maps/solutionengine.c | |
parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/mtd/maps/solutionengine.c')
-rw-r--r-- | drivers/mtd/maps/solutionengine.c | 4 |
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 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: solutionengine.c,v 1.14 2004/09/16 23:27:14 gleixner Exp $ | 2 | * $Id: solutionengine.c,v 1.15 2005/11/07 11:14:28 gleixner Exp $ |
3 | * | 3 | * |
4 | * Flash and EPROM on Hitachi Solution Engine and similar boards. | 4 | * Flash and EPROM on Hitachi Solution Engine and similar boards. |
5 | * | 5 | * |
@@ -67,7 +67,7 @@ static int __init init_soleng_maps(void) | |||
67 | soleng_eprom_map.virt = (void __iomem *)P1SEGADDR(0x01000000); | 67 | soleng_eprom_map.virt = (void __iomem *)P1SEGADDR(0x01000000); |
68 | simple_map_init(&soleng_eprom_map); | 68 | simple_map_init(&soleng_eprom_map); |
69 | simple_map_init(&soleng_flash_map); | 69 | simple_map_init(&soleng_flash_map); |
70 | 70 | ||
71 | printk(KERN_NOTICE "Probing for flash chips at 0x00000000:\n"); | 71 | printk(KERN_NOTICE "Probing for flash chips at 0x00000000:\n"); |
72 | flash_mtd = do_map_probe("cfi_probe", &soleng_flash_map); | 72 | flash_mtd = do_map_probe("cfi_probe", &soleng_flash_map); |
73 | if (!flash_mtd) { | 73 | if (!flash_mtd) { |