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/mbx860.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/mbx860.c')
| -rw-r--r-- | drivers/mtd/maps/mbx860.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/mbx860.c b/drivers/mtd/maps/mbx860.c index c5c6901a4763..06b118727846 100644 --- a/drivers/mtd/maps/mbx860.c +++ b/drivers/mtd/maps/mbx860.c | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: mbx860.c,v 1.8 2004/11/04 13:24:15 gleixner Exp $ | 2 | * $Id: mbx860.c,v 1.9 2005/11/07 11:14:27 gleixner Exp $ |
| 3 | * | 3 | * |
| 4 | * Handle mapping of the flash on MBX860 boards | 4 | * Handle mapping of the flash on MBX860 boards |
| 5 | * | 5 | * |
| 6 | * Author: Anton Todorov | 6 | * Author: Anton Todorov |
| 7 | * Copyright: (C) 2001 Emness Technology | 7 | * Copyright: (C) 2001 Emness Technology |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| @@ -46,7 +46,7 @@ static struct mtd_partition partition_info[]={ | |||
| 46 | { .name = "MBX flash APPLICATION partition", | 46 | { .name = "MBX flash APPLICATION partition", |
| 47 | .offset = (BOOT_PARTITION_SIZE_KiB+KERNEL_PARTITION_SIZE_KiB)*1024 } | 47 | .offset = (BOOT_PARTITION_SIZE_KiB+KERNEL_PARTITION_SIZE_KiB)*1024 } |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | 50 | ||
| 51 | static struct mtd_info *mymtd; | 51 | static struct mtd_info *mymtd; |
| 52 | 52 | ||