diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:24:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:24:08 -0500 |
commit | b3ce1debe2685383a9ad6ace9c49869c3968c013 (patch) | |
tree | dcb606fac467d6ce78a9c608a1e0d2323af44f2b /drivers/mtd/maps/edb7312.c | |
parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
parent | c2965f1129ee54afcc4ef293ff0f25fa3a7e7392 (diff) |
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/edb7312.c')
-rw-r--r-- | drivers/mtd/maps/edb7312.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/maps/edb7312.c b/drivers/mtd/maps/edb7312.c index 8b0da394f3fa..b48a3473ffc1 100644 --- a/drivers/mtd/maps/edb7312.c +++ b/drivers/mtd/maps/edb7312.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: edb7312.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $ | 2 | * $Id: edb7312.c,v 1.14 2005/11/07 11:14:27 gleixner Exp $ |
3 | * | 3 | * |
4 | * Handle mapping of the NOR flash on Cogent EDB7312 boards | 4 | * Handle mapping of the NOR flash on Cogent EDB7312 boards |
5 | * | 5 | * |
6 | * Copyright 2002 SYSGO Real-Time Solutions GmbH | 6 | * Copyright 2002 SYSGO Real-Time Solutions GmbH |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
@@ -46,7 +46,7 @@ struct map_info edb7312nor_map = { | |||
46 | #ifdef CONFIG_MTD_PARTITIONS | 46 | #ifdef CONFIG_MTD_PARTITIONS |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * MTD partitioning stuff | 49 | * MTD partitioning stuff |
50 | */ | 50 | */ |
51 | static struct mtd_partition static_partitions[3] = | 51 | static struct mtd_partition static_partitions[3] = |
52 | { | 52 | { |
@@ -80,7 +80,7 @@ int __init init_edb7312nor(void) | |||
80 | const char **type; | 80 | const char **type; |
81 | const char *part_type = 0; | 81 | const char *part_type = 0; |
82 | 82 | ||
83 | printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n", | 83 | printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n", |
84 | WINDOW_SIZE, WINDOW_ADDR); | 84 | WINDOW_SIZE, WINDOW_ADDR); |
85 | edb7312nor_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE); | 85 | edb7312nor_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE); |
86 | 86 | ||
@@ -88,7 +88,7 @@ int __init init_edb7312nor(void) | |||
88 | printk(MSG_PREFIX "failed to ioremap\n"); | 88 | printk(MSG_PREFIX "failed to ioremap\n"); |
89 | return -EIO; | 89 | return -EIO; |
90 | } | 90 | } |
91 | 91 | ||
92 | simple_map_init(&edb7312nor_map); | 92 | simple_map_init(&edb7312nor_map); |
93 | 93 | ||
94 | mymtd = 0; | 94 | mymtd = 0; |